added more messages

Author: coder114514

emulator/src/Chipset/CPU.cpp

@@ -335,11 +335,11 @@ namespace casioemu {
 
     uint16_t CPU::Fetch() {
         if (reg_csr.raw & ~impl_csr_mask) {
-            logger::Info("warning: CSR masked bits set\n");
+            logger::Info("warning: CSR masked bits set: %04zX\n", reg_csr.raw);
             reg_csr.raw &= impl_csr_mask;
         }
         if (reg_pc.raw & 1) {
-            logger::Info("warning: PC LSB set\n");
+            logger::Info("warning: PC LSB set: %04zX\n", reg_pc.raw);
             reg_pc.raw &= ~1;
         }
         uint16_t opcode = emulator.chipset.mmu.ReadCode((reg_csr.raw << 16) | reg_pc.raw);
@@ -359,8 +359,10 @@ namespace casioemu {
             impl_opcode = Fetch();
             OpcodeSource *handler = opcode_dispatch[impl_opcode];
 
-            if (!handler)
+            if (!handler) {
                 logger::Info("unrecognized instruction %04X at %06zX\n", impl_opcode, (((size_t)reg_csr.raw) << 16) | (reg_pc.raw - 2));
+                continue;
+            }
 
             impl_long_imm = 0;
             if (handler->hint & H_TI)

emulator/src/Chipset/MMU.cpp

@@ -10,13 +10,13 @@ namespace casioemu {
     const uint8_t UNMAPPED_VALUE = 0x00;
 
     MMU::MMU(Emulator &_emulator) : emulator(_emulator) {
-        segment_dispatch = new MemoryByte *[0x100];
-        for (size_t ix = 0; ix != 0x100; ++ix)
+        segment_dispatch = new MemoryByte *[0x10];
+        for (size_t ix = 0; ix != 0x10; ++ix)
             segment_dispatch[ix] = nullptr;
     }
 
     MMU::~MMU() {
-        for (size_t ix = 0; ix != 0x100; ++ix)
+        for (size_t ix = 0; ix != 0x10; ++ix)
             if (segment_dispatch[ix])
                 delete[] segment_dispatch[ix];
         delete[] segment_dispatch;
@@ -146,14 +146,18 @@ namespace casioemu {
 
         MemoryByte *segment = segment_dispatch[segment_index];
         if (!segment) {
+#ifdef PRINT_UNMAPPED_MSG
             logger::Info("code read from offset %04zX of unmapped segment %02zX\n", segment_offset, segment_index);
+#endif
             emulator.HandleMemoryError();
             return UNMAPPED_VALUE;
         }
 
         MMURegion *region = segment[segment_offset].region;
         if (!region) {
+#ifdef PRINT_UNMAPPED_MSG
             logger::Info("code read from unmapped offset %04zX of segment %02zX\n", segment_offset, segment_index);
+#endif
             emulator.HandleMemoryError();
             return UNMAPPED_VALUE;
         }
@@ -170,7 +174,9 @@ namespace casioemu {
 
         MemoryByte *segment = segment_dispatch[segment_index];
         if (!segment) {
+#ifdef PRINT_UNMAPPED_MSG
             logger::Info("read from offset %04zX of unmapped segment %02zX\n", segment_offset, segment_index);
+#endif
             emulator.HandleMemoryError();
             return UNMAPPED_VALUE;
         }
@@ -186,7 +192,9 @@ namespace casioemu {
             }
         }
         if (!region) {
+#ifdef PRINT_UNMAPPED_MSG
             logger::Info("read from unmapped offset %04zX of segment %02zX\n", segment_offset, segment_index);
+#endif
             emulator.HandleMemoryError();
             return UNMAPPED_VALUE;
         }
@@ -203,7 +211,9 @@ namespace casioemu {
 
         MemoryByte *segment = segment_dispatch[segment_index];
         if (!segment) {
+#ifdef PRINT_UNMAPPED_MSG
             logger::Info("write to offset %04zX of unmapped segment %02zX (%02zX)\n", segment_offset, segment_index, data);
+#endif
             emulator.HandleMemoryError();
             return;
         }
@@ -219,7 +229,9 @@ namespace casioemu {
             }
         }
         if (!region) {
+#ifdef PRINT_UNMAPPED_MSG
             logger::Info("write to unmapped offset %04zX of segment %02zX (%02zX)\n", segment_offset, segment_index, data);
+#endif
             emulator.HandleMemoryError();
             return;
         }

emulator/src/Gui/CodeViewer.cpp

@@ -21,9 +21,8 @@ casioemu::Emulator *m_emu = nullptr;
 CodeViewer::CodeViewer(std::string path) {
     src_path = path;
     std::ifstream f(src_path, std::ios::in);
-    if (!f.is_open()) {
-        casioemu::logger::Info("Fail to open disassembly, so code viewer won't be loaded: %s\n", src_path.c_str());
-    }
+    if (!f.is_open())
+        PANIC("\nFail to open disassembly code src: %s\n", src_path.c_str());
     casioemu::logger::Info("Start to load disassembly ...\n");
     char buf[200], adr[6];
     while (!f.eof()) {

emulator/src/Peripheral/ROMWindow.cpp

@@ -13,31 +13,23 @@ namespace casioemu {
         if (rom_base + size > emulator.chipset.rom_data.size())
             PANIC("Invalid ROM region: base %zx, size %zx\n", rom_base, size);
         uint8_t *data = emulator.chipset.rom_data.data();
-        auto offset = (ssize_t)rom_base - (ssize_t)region_base;
         if (description.empty())
             description = "ROM/Segment" + std::to_string(region_base >> 16);
 
-        MMURegion::WriteFunction write_function =
-            strict_memory
-                ? [](MMURegion *region, size_t address, uint8_t data) {
-                      logger::Info("ROM::[region write lambda]: attempt to write %02hhX to %06zX\n", data, address);
-                      region->emulator->HandleMemoryError();
-                  }
-                : [](MMURegion *, size_t, uint8_t) {
-                  };
+        MMURegion::WriteFunction write_function = [](MMURegion *, size_t, uint8_t) {};
+        if (strict_memory)
+            write_function = [](MMURegion *region, size_t address, uint8_t data) {
+                logger::Info("ROM::[region write lambda]: attempt to write %02hhX to %06zX\n", data, address);
+                region->emulator->HandleMemoryError();
+            };
 
-        if (offset >= 0)
-            region.Setup(
-                region_base, size, description, data + offset, [](MMURegion *region, size_t address) {
-                    return ((uint8_t *)(region->userdata))[address];
-                },
-                write_function, emulator);
-        else
-            region.Setup(
-                region_base, size, description, data + rom_base, [](MMURegion *region, size_t address) {
-                    return ((uint8_t *)(region->userdata))[address - region->base];
-                },
-                write_function, emulator);
+        region.Setup(
+            region_base, size, description, data + rom_base,
+            [](MMURegion *region, size_t address) {
+                return ((uint8_t *)(region->userdata))[address - region->base];
+            },
+            write_function,
+            emulator);
     }
 
     void ROMWindow::Initialise() {