diff options
Diffstat (limited to 'CompilerKit')
| -rw-r--r-- | CompilerKit/AsmKit/Arch/32x0.hpp (renamed from CompilerKit/AsmKit/Arch/32k.hpp) | 4 | ||||
| -rw-r--r-- | CompilerKit/AsmKit/Arch/64x0.hpp (renamed from CompilerKit/AsmKit/Arch/64k.hpp) | 4 | ||||
| -rw-r--r-- | CompilerKit/AsmKit/AsmKit.cc | 6 | ||||
| -rw-r--r-- | CompilerKit/Defines.hpp | 2 | ||||
| -rw-r--r-- | CompilerKit/StdKit/AE.hpp | 4 |
5 files changed, 12 insertions, 8 deletions
diff --git a/CompilerKit/AsmKit/Arch/32k.hpp b/CompilerKit/AsmKit/Arch/32x0.hpp index 291abfe..28bf754 100644 --- a/CompilerKit/AsmKit/Arch/32k.hpp +++ b/CompilerKit/AsmKit/Arch/32x0.hpp @@ -12,14 +12,14 @@ #include <CompilerKit/Defines.hpp> // @brief 32x0 support. -// @file Arch/64k.hpp +// @file Arch/32x0.hpp #define kAsmOpcodeDecl(__NAME, __OPCODE, __FUNCT3, __FUNCT7) \ { .fName = __NAME, .fOpcode = __OPCODE, .fFunct3 = __FUNCT3, .fFunct7 = __FUNCT7 }, -// placeholder for funct7/funct7-rs2 + #define kAsmImmediate 0x01 #define kAsmSyscall 0x02 #define kAsmJump 0x03 diff --git a/CompilerKit/AsmKit/Arch/64k.hpp b/CompilerKit/AsmKit/Arch/64x0.hpp index 95d635f..161bc06 100644 --- a/CompilerKit/AsmKit/Arch/64k.hpp +++ b/CompilerKit/AsmKit/Arch/64x0.hpp @@ -12,13 +12,13 @@ #include <CompilerKit/Defines.hpp> // @brief 64x0 support. -// @file Arch/64k.hpp +// @file Arch/64x0.hpp #define kAsmOpcodeDecl(__NAME, __OPCODE, __FUNCT3, __FUNCT7) \ { .fName = __NAME, .fOpcode = __OPCODE, .fFunct3 = __FUNCT3, .fFunct7 = __FUNCT7 }, -// placeholder for funct7/funct7-rs2 + #define kAsmImmediate 0x01 #define kAsmRegToReg 0x02 #define kAsmSyscall 0x03 diff --git a/CompilerKit/AsmKit/AsmKit.cc b/CompilerKit/AsmKit/AsmKit.cc index 3118e56..1e8ec4a 100644 --- a/CompilerKit/AsmKit/AsmKit.cc +++ b/CompilerKit/AsmKit/AsmKit.cc @@ -13,7 +13,7 @@ #include <iostream> //! @file AsmKit.cpp -//! @brief AssemblyKit +//! @brief AssemblyKit source implementation. namespace CompilerKit { @@ -32,7 +32,9 @@ namespace CompilerKit void AssemblyFactory::Mount(AssemblyMountpoint* mountPtr) noexcept { if (mountPtr) + { fMounted = mountPtr; + } } AssemblyMountpoint* AssemblyFactory::Unmount() noexcept @@ -40,7 +42,9 @@ namespace CompilerKit auto mount_prev = fMounted; if (mount_prev) + { fMounted = nullptr; + } return mount_prev; } diff --git a/CompilerKit/Defines.hpp b/CompilerKit/Defines.hpp index c29417d..d46508d 100644 --- a/CompilerKit/Defines.hpp +++ b/CompilerKit/Defines.hpp @@ -134,6 +134,6 @@ namespace CompilerKit typedef char char_type; #define kObjectFileExt ".o" -#define kAsmFileExt64x0 ".64x" +#define kAsmFileExts { ".64x", ".32x", ".masm", ".s", ".S" } #endif /* ifndef __CXXKIT_DEFINES_HPP__ */ diff --git a/CompilerKit/StdKit/AE.hpp b/CompilerKit/StdKit/AE.hpp index 403d7cb..8843404 100644 --- a/CompilerKit/StdKit/AE.hpp +++ b/CompilerKit/StdKit/AE.hpp @@ -97,10 +97,10 @@ namespace CompilerKit::Utils std::ifstream USED_FP; public: - explicit AEReadableProtocol() = default; + AEReadableProtocol() = default; ~AEReadableProtocol() = default; - CXXKIT_COPY_DEFAULT(AEReadableProtocol); + CXXKIT_COPY_DELETE(AEReadableProtocol); AERecordHeaderPtr Read(char* raw, std::size_t sz) { |