lc3sim_cpp: Add types.h, 32bit version, and regress test.

Author: Alexei

CMakeLists.txt

@@ -6,6 +6,7 @@ project(lc3
 add_subdirectory(lcc-1.3)
 add_subdirectory(lc3tools)
 add_subdirectory(lc3sim-c)
+add_subdirectory(lc3sim_cpp)
 
 enable_testing()
 add_subdirectory(test)

lc3sim_cpp/CMakeLists.txt

@@ -29,6 +29,7 @@ set(SOURCES
     ${CMAKE_CURRENT_BINARY_DIR}/lc3os.c
     ${CMAKE_CURRENT_BINARY_DIR}/lc3os32.c
     lc3sim.h
+    types.h
     instr_config.h
     lc3sim.cpp
     )

lc3sim_cpp/lc3sim.cpp

@@ -28,9 +28,6 @@ static uint16_t Swap16(uint16_t val) {
 }
 #endif
 
-#define LC3_SIGN_BIT_INDEX (sizeof(LC3_Sim::RegType) * 8 - 1)
-#define LC3_STATUS_BIT_INDEX (sizeof(LC3_Sim::RegType) * 8 - 1)
-
 #define SING_BIT (1 << LC3_SIGN_BIT_INDEX)
 #define STATUS_BIT (1 << LC3_STATUS_BIT_INDEX)
 

lc3sim_cpp/lc3sim.h

@@ -1,17 +1,17 @@
 // Copyright 2020 by Alexei Bezborodov <[email protected]>
 #pragma once
 
-#include <stdint.h>
+#include <types.h>
 
 namespace LC3_Sim
 {
 
 typedef char        Char;
 typedef bool        Bool;
-typedef uint16_t    RegType;
-typedef uint32_t    RegNumType;
-typedef uint32_t    InstructionIndex;
-typedef RegType     AddressType;
+typedef unsigned int RegNumType;
+typedef unsigned int InstructionIndex;
+typedef LC3_Sim::LC3_RegisterType RegType;
+typedef LC3_Sim::LC3MemAddressType AddressType;
 
 class IInputOutput
 {

lc3sim_cpp/main.cpp

@@ -58,7 +58,7 @@ class SimpleVM: public LC3_Sim::IVirtualMemory
 public:
     SimpleVM()
     {
-        m_Memory.resize(65536);
+        m_Memory.resize(LC3_MAX_MEMORY_ADDRESS);
     }
 
     virtual LC3_Sim::IVirtualMemory::Result Read(LC3_Sim::RegType* a_Value, LC3_Sim::AddressType a_Address) const override
@@ -106,11 +106,11 @@ int main(int argc, const char* argv[])
             break;
 
         case LC3_Sim::Processor::lrFileNotFound:
-            printf("%s: Failed to load input\n", argv[0]);
+            printf("%s: Failed to load input.\n", argv[0]);
             return 1;
 
         case LC3_Sim::Processor::lrFileTooLarge:
-            printf("%s: Failed to load input: Input exceeded memory space\n", argv[0]);
+            printf("%s: Failed to load input: Input exceeded memory space.\n", argv[0]);
             return 1;
     }
 

lc3sim_cpp/types.h

@@ -0,0 +1,29 @@
+// Copyright 2020 by Alexei Bezborodov <[email protected]>
+
+#pragma once
+
+#include <stdint.h>
+
+namespace LC3_Sim
+{
+
+#ifdef LC3_32BIT
+
+typedef uint32_t LC3_RegisterType;
+typedef uint32_t LC3MemAddressType;
+
+#define LC3_MAX_MEMORY_ADDRESS (2*UINT16_MAX) // may be up to UINT32_MAX
+
+#else // LC3_16BIT
+
+typedef uint16_t LC3_RegisterType;
+typedef uint16_t LC3MemAddressType;
+
+#define LC3_MAX_MEMORY_ADDRESS UINT16_MAX
+
+#endif
+
+#define LC3_SIGN_BIT_INDEX (sizeof(LC3_Sim::LC3_RegisterType) * 8 - 1)
+#define LC3_STATUS_BIT_INDEX (sizeof(LC3_Sim::LC3_RegisterType) * 8 - 1)
+
+} // namespace LC3_Sim

test/TestFunc.cmake

@@ -7,6 +7,9 @@ set(LC3SIM ${INSTALL_DIR}/lc3sim)
 set(LC3SIM_C16 ${INSTALL_DIR}/lc3sim-c16) 
 set(LC3SIM_C32 ${INSTALL_DIR}/lc3sim-c32) 
 
+set(LC3SIM_CPP16 ${INSTALL_DIR}/lc3sim_cpp16) 
+set(LC3SIM_CPP32 ${INSTALL_DIR}/lc3sim_cpp32) 
+
 set(CORRECT_EXE ${CMAKE_CURRENT_SOURCE_DIR}/../correct_obj_file)
 set(CORRECT32_EXE ${CMAKE_CURRENT_SOURCE_DIR}/../correct_obj32_file)
 

test/regress/CMakeLists.txt

@@ -148,6 +148,7 @@ foreach (index RANGE 0 ${obj_16bit_file_count})
     list(FIND exclude_src_files_for_lc3sim_c ${cur_src_file} find_src_file)
     if (${find_src_file} EQUAL -1)
         AndRegressTest(${LC3SIM_C16} ${cur_obj_file} ${cur_src_file} "sim16" ${DEFAULT_OUT} ${TYPE_OUT_STDOUT})
+        AndRegressTest(${LC3SIM_CPP16} ${cur_obj_file} ${cur_src_file} "sim_cpp16" ${DEFAULT_OUT} ${TYPE_OUT_STDOUT})
     endif()
 
     list(FIND exclude_src_files_for_lc3sim ${cur_src_file} find_src_file)
@@ -176,5 +177,6 @@ foreach (index RANGE 0 ${obj_32bit_file_count})
     list(FIND exclude_src_files_for_lc3sim_c32 ${cur_src_file} find_src_file)
     if (${find_src_file} EQUAL -1)
         AndRegressTest(${LC3SIM_C32} ${cur_obj_file} ${cur_src_file} "sim32" ${DEFAULT_OUT} ${TYPE_OUT_STDOUT})
+        AndRegressTest(${LC3SIM_CPP32} ${cur_obj_file} ${cur_src_file} "sim_cpp32" ${DEFAULT_OUT} ${TYPE_OUT_STDOUT})
     endif()
 endforeach()