diff options
| author | Amlal <amlal.elmahrouss@icloud.com> | 2025-01-20 18:08:55 +0100 |
|---|---|---|
| committer | Amlal <amlal.elmahrouss@icloud.com> | 2025-01-20 18:08:55 +0100 |
| commit | 7de3593a311cb8912586ba378c86271e9e0ea1db (patch) | |
| tree | d5b353cb3e80e246e92838f2a469c1120067f9cc /dev/LibCompiler | |
| parent | 288d020aa081076dade30cad61be1c9fae616f98 (diff) | |
ADD: Fixes to the posix JSON manifest.
Signed-off-by: Amlal <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/LibCompiler')
| -rw-r--r-- | dev/LibCompiler/AAL/CPU/amd64.h | 27 | ||||
| -rw-r--r-- | dev/LibCompiler/AAL/CPU/arm64.h | 20 | ||||
| -rw-r--r-- | dev/LibCompiler/Defines.h | 8 | ||||
| -rw-r--r-- | dev/LibCompiler/Macros.h | 10 | ||||
| -rw-r--r-- | dev/LibCompiler/NFC/ErrorID.h | 14 | ||||
| -rw-r--r-- | dev/LibCompiler/UUID.h | 4 | ||||
| -rw-r--r-- | dev/LibCompiler/src/AssemblerARM64.cc | 28 |
7 files changed, 56 insertions, 55 deletions
diff --git a/dev/LibCompiler/AAL/CPU/amd64.h b/dev/LibCompiler/AAL/CPU/amd64.h index 2741c3f..7c08628 100644 --- a/dev/LibCompiler/AAL/CPU/amd64.h +++ b/dev/LibCompiler/AAL/CPU/amd64.h @@ -41,19 +41,18 @@ struct CpuOpcodeAMD64 inline std::vector<CpuOpcodeAMD64> kOpcodesAMD64 = { kAsmOpcodeDecl("int", 0xCD) - kAsmOpcodeDecl("into", 0xCE) - kAsmOpcodeDecl("intd", 0xF1) - kAsmOpcodeDecl("int3", 0xC3) - kAsmOpcodeDecl("iret", 0xCF) - kAsmOpcodeDecl("retf", 0xCB) - kAsmOpcodeDecl("retn", 0xC3) - kAsmOpcodeDecl("ret", 0xC3) - kAsmOpcodeDecl("sti", 0xfb) - kAsmOpcodeDecl("cli", 0xfa) - kAsmOpcodeDecl("hlt", 0xf4) - kAsmOpcodeDecl("nop", 0x90) - kAsmOpcodeDecl("mov", 0x48) - kAsmOpcodeDecl("call", 0xFF) -}; + kAsmOpcodeDecl("into", 0xCE) + kAsmOpcodeDecl("intd", 0xF1) + kAsmOpcodeDecl("int3", 0xC3) + kAsmOpcodeDecl("iret", 0xCF) + kAsmOpcodeDecl("retf", 0xCB) + kAsmOpcodeDecl("retn", 0xC3) + kAsmOpcodeDecl("ret", 0xC3) + kAsmOpcodeDecl("sti", 0xfb) + kAsmOpcodeDecl("cli", 0xfa) + kAsmOpcodeDecl("hlt", 0xf4) + kAsmOpcodeDecl("nop", 0x90) + kAsmOpcodeDecl("mov", 0x48) + kAsmOpcodeDecl("call", 0xFF)}; #define kAsmRegisterLimit 16 diff --git a/dev/LibCompiler/AAL/CPU/arm64.h b/dev/LibCompiler/AAL/CPU/arm64.h index 2013402..58910a0 100644 --- a/dev/LibCompiler/AAL/CPU/arm64.h +++ b/dev/LibCompiler/AAL/CPU/arm64.h @@ -24,17 +24,19 @@ struct PACKED CpuOpcodeArm64_Data final uint32_t fRd : 5; // Bits 4–0: Destination register Rd }; -typedef struct { - uint32_t opcode : 6; // Bits 31–26: Branch opcode - int32_t offset : 26; // Bits 25–0: Signed offset (branch target) +typedef struct +{ + uint32_t opcode : 6; // Bits 31–26: Branch opcode + int32_t offset : 26; // Bits 25–0: Signed offset (branch target) } PACKED CpuOpcodeArm64_Branch; -typedef struct { - uint32_t size : 2; // Bits 31–30: Size of the data - uint32_t opcode : 7; // Bits 29–23: Opcode for load/store - uint32_t offset : 12; // Bits 22–10: Offset - uint32_t rn : 5; // Bits 9–5: Base address register Rn - uint32_t rt : 5; // Bits 4–0: Target/source register Rt +typedef struct +{ + uint32_t size : 2; // Bits 31–30: Size of the data + uint32_t opcode : 7; // Bits 29–23: Opcode for load/store + uint32_t offset : 12; // Bits 22–10: Offset + uint32_t rn : 5; // Bits 9–5: Base address register Rn + uint32_t rt : 5; // Bits 4–0: Target/source register Rt } PACKED CpuOpcodeArm64_LoadStore; #define kAsmRegisterLimit (30) diff --git a/dev/LibCompiler/Defines.h b/dev/LibCompiler/Defines.h index 0a3a07c..2da37ac 100644 --- a/dev/LibCompiler/Defines.h +++ b/dev/LibCompiler/Defines.h @@ -78,19 +78,19 @@ #define rt_copy_memory(dst, src, len) memcpy(dst, src, len) #endif -#define LIBCOMPILER_COPY_DELETE(KLASS) \ +#define LIBCOMPILER_COPY_DELETE(KLASS) \ KLASS& operator=(const KLASS&) = delete; \ KLASS(const KLASS&) = delete; -#define LIBCOMPILER_COPY_DEFAULT(KLASS) \ +#define LIBCOMPILER_COPY_DEFAULT(KLASS) \ KLASS& operator=(const KLASS&) = default; \ KLASS(const KLASS&) = default; -#define LIBCOMPILER_MOVE_DELETE(KLASS) \ +#define LIBCOMPILER_MOVE_DELETE(KLASS) \ KLASS& operator=(KLASS&&) = delete; \ KLASS(KLASS&&) = delete; -#define LIBCOMPILER_MOVE_DEFAULT(KLASS) \ +#define LIBCOMPILER_MOVE_DEFAULT(KLASS) \ KLASS& operator=(KLASS&&) = default; \ KLASS(KLASS&&) = default; diff --git a/dev/LibCompiler/Macros.h b/dev/LibCompiler/Macros.h index 6caceb4..8bb01fd 100644 --- a/dev/LibCompiler/Macros.h +++ b/dev/LibCompiler/Macros.h @@ -9,25 +9,25 @@ #ifndef _MACROS_H_ #define _MACROS_H_ -#define LIBCOMPILER_COPY_DELETE(KLASS) \ +#define LIBCOMPILER_COPY_DELETE(KLASS) \ KLASS& operator=(const KLASS&) = delete; \ KLASS(const KLASS&) = delete; -#define LIBCOMPILER_COPY_DEFAULT(KLASS) \ +#define LIBCOMPILER_COPY_DEFAULT(KLASS) \ KLASS& operator=(const KLASS&) = default; \ KLASS(const KLASS&) = default; -#define LIBCOMPILER_MOVE_DELETE(KLASS) \ +#define LIBCOMPILER_MOVE_DELETE(KLASS) \ KLASS& operator=(KLASS&&) = delete; \ KLASS(KLASS&&) = delete; -#define LIBCOMPILER_MOVE_DEFAULT(KLASS) \ +#define LIBCOMPILER_MOVE_DEFAULT(KLASS) \ KLASS& operator=(KLASS&&) = default; \ KLASS(KLASS&&) = default; /// @note xxxx is the error placeholder, in hexadecimal. #define LIBCOMPILER_ERROR_PREFIX_CXX "CXXxxxx" -#define LIBCOMPILER_ERROR_PREFIX_CL "CLxxxx" +#define LIBCOMPILER_ERROR_PREFIX_CL "CLxxxx" #define LIBCOMPILER_ERROR_PREFIX_ASM "ASMxxxx" #endif /* ifndef _MACROS_H_ */ diff --git a/dev/LibCompiler/NFC/ErrorID.h b/dev/LibCompiler/NFC/ErrorID.h index 9e188cd..6e5d9e9 100644 --- a/dev/LibCompiler/NFC/ErrorID.h +++ b/dev/LibCompiler/NFC/ErrorID.h @@ -12,11 +12,11 @@ #include <LibCompiler/Defines.h> #include <LibCompiler/NFC/ErrorOr.h> -#define LIBCOMPILER_EXEC_ERROR -30 +#define LIBCOMPILER_EXEC_ERROR -30 #define LIBCOMPILER_FILE_NOT_FOUND -31 -#define LIBCOMPILER_DIR_NOT_FOUND -32 -#define LIBCOMPILER_FILE_EXISTS -33 -#define LIBCOMPILER_TOO_LONG -34 -#define LIBCOMPILER_INVALID_DATA -35 -#define LIBCOMPILER_UNIMPLEMENTED -36 -#define LIBCOMPILER_FAT_ERROR -37 +#define LIBCOMPILER_DIR_NOT_FOUND -32 +#define LIBCOMPILER_FILE_EXISTS -33 +#define LIBCOMPILER_TOO_LONG -34 +#define LIBCOMPILER_INVALID_DATA -35 +#define LIBCOMPILER_UNIMPLEMENTED -36 +#define LIBCOMPILER_FAT_ERROR -37 diff --git a/dev/LibCompiler/UUID.h b/dev/LibCompiler/UUID.h index d89205d..c92d1aa 100644 --- a/dev/LibCompiler/UUID.h +++ b/dev/LibCompiler/UUID.h @@ -199,7 +199,7 @@ namespace uuids process_byte(static_cast<unsigned char>((bitCount >> 24) & 0xFF)); process_byte(static_cast<unsigned char>((bitCount >> 16) & 0xFF)); process_byte(static_cast<unsigned char>((bitCount >> 8) & 0xFF)); - process_byte(static_cast<unsigned char>((bitCount)&0xFF)); + process_byte(static_cast<unsigned char>((bitCount) & 0xFF)); memcpy(digest, m_digest, 5 * sizeof(uint32_t)); return digest; @@ -842,7 +842,7 @@ namespace uuids } private: - uuid nsuuid; + uuid nsuuid; Detail::sha1 hasher; }; diff --git a/dev/LibCompiler/src/AssemblerARM64.cc b/dev/LibCompiler/src/AssemblerARM64.cc index 7de167d..8573a45 100644 --- a/dev/LibCompiler/src/AssemblerARM64.cc +++ b/dev/LibCompiler/src/AssemblerARM64.cc @@ -197,7 +197,7 @@ LIBCOMPILER_MODULE(AssemblerMainARM64) { if (kVerbose) { - kStdOut << "AssemblerPower: Writing object file...\n"; + kStdOut << "AssemblerARM64: Writing object file...\n"; } // this is the final step, write everything to the file. @@ -210,8 +210,8 @@ LIBCOMPILER_MODULE(AssemblerMainARM64) if (kRecords.empty()) { - kStdErr << "AssemblerPower: At least one record is needed to write an object " - "file.\nAssemblerPower: Make one using `public_segment .code64 foo_bar`.\n"; + kStdErr << "AssemblerARM64: At least one record is needed to write an object " + "file.\nAssemblerARM64: Make one using `public_segment .code64 foo_bar`.\n"; std::filesystem::remove(object_output); return 1; @@ -230,7 +230,7 @@ LIBCOMPILER_MODULE(AssemblerMainARM64) file_ptr_out << record_hdr; if (kVerbose) - kStdOut << "AssemblerPower: Wrote record " << record_hdr.fName << "...\n"; + kStdOut << "AssemblerARM64: Wrote record " << record_hdr.fName << "...\n"; } // increment once again, so that we won't lie about the kUndefinedSymbols. @@ -241,7 +241,7 @@ LIBCOMPILER_MODULE(AssemblerMainARM64) LibCompiler::AERecordHeader undefined_sym{0}; if (kVerbose) - kStdOut << "AssemblerPower: Wrote symbol " << sym << " to file...\n"; + kStdOut << "AssemblerARM64: Wrote symbol " << sym << " to file...\n"; undefined_sym.fKind = kAENullType; undefined_sym.fSize = sym.size(); @@ -272,7 +272,7 @@ LIBCOMPILER_MODULE(AssemblerMainARM64) { if (kVerbose) { - kStdOut << "AssemblerPower: Write raw binary...\n"; + kStdOut << "AssemblerARM64: Write raw binary...\n"; } } @@ -283,13 +283,13 @@ LIBCOMPILER_MODULE(AssemblerMainARM64) } if (kVerbose) - kStdOut << "AssemblerPower: Wrote file with program in it.\n"; + kStdOut << "AssemblerARM64: Wrote file with program in it.\n"; file_ptr_out.flush(); file_ptr_out.close(); if (kVerbose) - kStdOut << "AssemblerPower: Exit succeeded.\n"; + kStdOut << "AssemblerARM64: Exit succeeded.\n"; return 0; } @@ -297,7 +297,7 @@ LIBCOMPILER_MODULE(AssemblerMainARM64) asm_fail_exit: if (kVerbose) - kStdOut << "AssemblerPower: Exit failed.\n"; + kStdOut << "AssemblerARM64: Exit failed.\n"; return LIBCOMPILER_EXEC_ERROR; } @@ -382,7 +382,7 @@ static bool asm_read_attributes(std::string& line) return true; } - // public_segment is a special keyword used by AssemblerPower to tell the AE output stage to + // public_segment is a special keyword used by Assembler to tell the AE output stage to // mark this section as a header. it currently supports .code64, .data64., // .zero64 else if (LibCompiler::find_word(line, "public_segment")) @@ -599,7 +599,7 @@ bool LibCompiler::EncoderARM64::WriteNumber(const std::size_t& pos, if (kVerbose) { - kStdOut << "AssemblerPower: found a base 16 number here: " + kStdOut << "AssemblerARM64: found a base 16 number here: " << jump_label.substr(pos) << "\n"; } @@ -621,7 +621,7 @@ bool LibCompiler::EncoderARM64::WriteNumber(const std::size_t& pos, if (kVerbose) { - kStdOut << "AssemblerPower: found a base 2 number here: " + kStdOut << "AssemblerARM64: found a base 2 number here: " << jump_label.substr(pos) << "\n"; } @@ -648,7 +648,7 @@ bool LibCompiler::EncoderARM64::WriteNumber(const std::size_t& pos, if (kVerbose) { - kStdOut << "AssemblerPower: found a base 8 number here: " + kStdOut << "AssemblerARM64: found a base 8 number here: " << jump_label.substr(pos) << "\n"; } @@ -683,7 +683,7 @@ bool LibCompiler::EncoderARM64::WriteNumber(const std::size_t& pos, if (kVerbose) { - kStdOut << "AssemblerPower: found a base 10 number here: " << jump_label.substr(pos) + kStdOut << "AssemblerARM64: found a base 10 number here: " << jump_label.substr(pos) << "\n"; } |
