diff options
Diffstat (limited to 'C++Kit')
| -rw-r--r-- | C++Kit/AsmKit/Arch/32k.hpp | 4 | ||||
| -rw-r--r-- | C++Kit/AsmKit/Arch/64k.hpp | 4 | ||||
| -rw-r--r-- | C++Kit/AsmKit/AsmKit.cc (renamed from C++Kit/AsmKit/AsmKit.cpp) | 0 | ||||
| -rw-r--r-- | C++Kit/AsmKit/AsmKit.hpp | 8 | ||||
| -rw-r--r-- | C++Kit/StdKit/ErrorID.hpp | 2 | ||||
| -rw-r--r-- | C++Kit/StdKit/ErrorOr.hpp | 4 | ||||
| -rw-r--r-- | C++Kit/StdKit/Ref.hpp | 2 | ||||
| -rw-r--r-- | C++Kit/StdKit/String.cc (renamed from C++Kit/StdKit/String.cpp) | 4 | ||||
| -rw-r--r-- | C++Kit/StdKit/String.hpp | 4 |
9 files changed, 16 insertions, 16 deletions
diff --git a/C++Kit/AsmKit/Arch/32k.hpp b/C++Kit/AsmKit/Arch/32k.hpp index cb948b5..2e73efa 100644 --- a/C++Kit/AsmKit/Arch/32k.hpp +++ b/C++Kit/AsmKit/Arch/32k.hpp @@ -28,7 +28,7 @@ #define kAsmHWord 1 #define kAsmWord 2 -struct NCOpcode +struct CpuCode32x0 { const char fName[16]; char fOpcode; @@ -41,7 +41,7 @@ struct NCOpcode #define kAsmHWordStr ".h" #define kAsmByteStr ".b" -inline std::vector<NCOpcode> kOpcodesStd = { +inline std::vector<CpuCode32x0> kOpcodes32x0 = { kAsmOpcodeDecl("nop", 0b0100011, 0b0000000, kAsmImmediate) // nothing to do. kAsmOpcodeDecl("jmp", 0b1110011, 0b0000011, kAsmJump) // jump to branch kAsmOpcodeDecl("move", 0b0100011, 0b101, kAsmImmediate) diff --git a/C++Kit/AsmKit/Arch/64k.hpp b/C++Kit/AsmKit/Arch/64k.hpp index c4ce648..00ab973 100644 --- a/C++Kit/AsmKit/Arch/64k.hpp +++ b/C++Kit/AsmKit/Arch/64k.hpp @@ -25,7 +25,7 @@ #define kAsmSyscall 0x02 #define kAsmJump 0x03 -struct NCOpcode +struct CpuCode64x0 { const char fName[16]; char fOpcode; @@ -33,7 +33,7 @@ struct NCOpcode char fFunct7; }; -inline std::vector<NCOpcode> kOpcodesStd = { +inline std::vector<CpuCode64x0> kOpcodes64x0 = { kAsmOpcodeDecl("np", 0b0100011, 0b0000000, kAsmImmediate) // mv r0, r0 kAsmOpcodeDecl("jb", 0b1110011, 0b0000011, kAsmJump) // jump to branch kAsmOpcodeDecl("jlr", 0b1110011, 0b0000111, kAsmJump) // jump and link return register diff --git a/C++Kit/AsmKit/AsmKit.cpp b/C++Kit/AsmKit/AsmKit.cc index d44874d..d44874d 100644 --- a/C++Kit/AsmKit/AsmKit.cpp +++ b/C++Kit/AsmKit/AsmKit.cc diff --git a/C++Kit/AsmKit/AsmKit.hpp b/C++Kit/AsmKit/AsmKit.hpp index 8674922..68ea4c0 100644 --- a/C++Kit/AsmKit/AsmKit.hpp +++ b/C++Kit/AsmKit/AsmKit.hpp @@ -27,11 +27,12 @@ namespace CxxKit CXXKIT_COPY_DEFAULT(AssemblyMountpoint); //@ brief compile to object file. - // Example C++ -> Assembly -> AE object. + // Example C++ -> MASM -> AE object. virtual Int32 CompileToFormat(StringView& src, Int32 arch) = 0; }; + /// @brief Simple assembly factory class AssemblyFactory final { public: @@ -44,9 +45,8 @@ namespace CxxKit enum { kArchAMD64, - kArchARM64, - kArchPowerPC, - kArchARC, + kArch32x0, + kArch64x0, kArchRISCV, kArchUnknown, }; diff --git a/C++Kit/StdKit/ErrorID.hpp b/C++Kit/StdKit/ErrorID.hpp index 4935a8e..ddbf83b 100644 --- a/C++Kit/StdKit/ErrorID.hpp +++ b/C++Kit/StdKit/ErrorID.hpp @@ -1,7 +1,7 @@ /* * ======================================================== * - * NewOS + * CxxKit * Copyright Western Company, all rights reserved. * * ======================================================== diff --git a/C++Kit/StdKit/ErrorOr.hpp b/C++Kit/StdKit/ErrorOr.hpp index 05e74e4..4b5d1d2 100644 --- a/C++Kit/StdKit/ErrorOr.hpp +++ b/C++Kit/StdKit/ErrorOr.hpp @@ -1,7 +1,7 @@ /* * ======================================================== * - * NewOS + * CxxKit * Copyright Western Company, all rights reserved. * * ======================================================== @@ -55,4 +55,4 @@ class ErrorOr final using ErrorOrAny = ErrorOr<voidPtr>; -} // namespace NewOS +} // namespace CxxKit diff --git a/C++Kit/StdKit/Ref.hpp b/C++Kit/StdKit/Ref.hpp index 2a32a60..4f4e822 100644 --- a/C++Kit/StdKit/Ref.hpp +++ b/C++Kit/StdKit/Ref.hpp @@ -2,7 +2,7 @@ /* * ======================================================== * - * NewOS + * CxxKit * Copyright Western Company, all rights reserved. * * ======================================================== diff --git a/C++Kit/StdKit/String.cpp b/C++Kit/StdKit/String.cc index b4199a8..be07c26 100644 --- a/C++Kit/StdKit/String.cpp +++ b/C++Kit/StdKit/String.cc @@ -1,7 +1,7 @@ /* * ======================================================== * - * hCore + * CxxKit * Copyright Western Company, all rights reserved. * * ======================================================== @@ -227,4 +227,4 @@ namespace CxxKit return *this; } -} // namespace hCore +} // namespace CxxKit diff --git a/C++Kit/StdKit/String.hpp b/C++Kit/StdKit/String.hpp index a3b1f5f..4addea8 100644 --- a/C++Kit/StdKit/String.hpp +++ b/C++Kit/StdKit/String.hpp @@ -1,7 +1,7 @@ /* * ======================================================== * - * NewOS + * CxxKit * Copyright Western Company, all rights reserved. * * ======================================================== @@ -69,4 +69,4 @@ namespace CxxKit static bool Equals(const char *lhs, const char *rhs); }; -} // namespace NewOS +} // namespace CxxKit |