release

Author: coder114514

emulator/src/Chipset/CPU.cpp

@@ -451,7 +451,7 @@ namespace casioemu {
                 output << saved_lcsr << ":" << std::setw(4) << saved_lr;
                 output << " - lr pushed at " << std::setw(4) << frame.lr_push_address;
             } else {
-                output << reg_lcsr << ":" << reg_lr;
+                output << reg_lcsr << ":" << std::setw(4) << reg_lr;
             }
             output << '\n';
         }

emulator/src/Chipset/Chipset.cpp

@@ -89,7 +89,7 @@ namespace casioemu {
     }
 
     void Chipset::Reset() {
-        logger::Info("Chipset reset!\n");
+        // logger::Info("Chipset reset!\n");
 
         data_int_mask = 0;
         data_int_pending = 0;

emulator/src/Gui/ui.cpp

@@ -43,7 +43,7 @@ void gui_loop() {
 }
 
 int test_gui() {
-    window = SDL_CreateWindow("CasioEmuX", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1816, 1100, window_flags);
+    window = SDL_CreateWindow("CasioEmuX", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1280, 720, window_flags);
     renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED);
     if (renderer == nullptr) {
         SDL_Log("Error creating SDL_Renderer!");

emulator/src/Peripheral/Keyboard.cpp

@@ -28,30 +28,40 @@ namespace casioemu {
         region_input_filter.Setup(0xF042, 1, "Keyboard/InputFilter", &input_filter, MMURegion::DefaultRead<uint8_t>, MMURegion::DefaultWrite<uint8_t>, emulator);
 
         region_ko_mask.Setup(
-            0xF044, 2, "Keyboard/KOMask", this, [](MMURegion *region, size_t offset) {
-			offset -= region->base;
-			Keyboard *keyboard = ((Keyboard *)region->userdata);
-			return (uint8_t)((keyboard->keyboard_out_mask & 0x03FF) >> (offset * 8)); }, [](MMURegion *region, size_t offset, uint8_t data) {
-			offset -= region->base;
-			Keyboard *keyboard = ((Keyboard *)region->userdata);
-			keyboard->keyboard_out_mask &= ~(((uint16_t)0xFF) << (offset * 8));
-			keyboard->keyboard_out_mask |= ((uint16_t)data) << (offset * 8);
-			keyboard->keyboard_out_mask &= 0x03FF;
-			if (!offset)
-				keyboard->RecalculateKI(); }, emulator);
+            0xF044, 2, "Keyboard/KOMask", this,
+            [](MMURegion *region, size_t offset) {
+                offset -= region->base;
+                Keyboard *keyboard = ((Keyboard *)region->userdata);
+                return (uint8_t)((keyboard->keyboard_out_mask & 0x03FF) >> (offset * 8));
+            },
+            [](MMURegion *region, size_t offset, uint8_t data) {
+                offset -= region->base;
+                Keyboard *keyboard = ((Keyboard *)region->userdata);
+                keyboard->keyboard_out_mask &= ~(((uint16_t)0xFF) << (offset * 8));
+                keyboard->keyboard_out_mask |= ((uint16_t)data) << (offset * 8);
+                keyboard->keyboard_out_mask &= 0x03FF;
+                if (!offset)
+                    keyboard->RecalculateKI();
+            },
+            emulator);
 
         region_ko.Setup(
-            0xF046, 2, "Keyboard/KO", this, [](MMURegion *region, size_t offset) {
-			offset -= region->base;
-			Keyboard *keyboard = ((Keyboard *)region->userdata);
-			return (uint8_t)((keyboard->keyboard_out & 0x03FF) >> (offset * 8)); }, [](MMURegion *region, size_t offset, uint8_t data) {
-			offset -= region->base;
-			Keyboard *keyboard = ((Keyboard *)region->userdata);
-			keyboard->keyboard_out &= ~(((uint16_t)0xFF) << (offset * 8));
-			keyboard->keyboard_out |= ((uint16_t)data) << (offset * 8);
-			keyboard->keyboard_out &= 0x03FF;
-			if (!offset)
-				keyboard->RecalculateKI(); }, emulator);
+            0xF046, 2, "Keyboard/KO", this,
+            [](MMURegion *region, size_t offset) {
+                offset -= region->base;
+                Keyboard *keyboard = ((Keyboard *)region->userdata);
+                return (uint8_t)((keyboard->keyboard_out & 0x03FF) >> (offset * 8));
+            },
+            [](MMURegion *region, size_t offset, uint8_t data) {
+                offset -= region->base;
+                Keyboard *keyboard = ((Keyboard *)region->userdata);
+                keyboard->keyboard_out &= ~(((uint16_t)0xFF) << (offset * 8));
+                keyboard->keyboard_out |= ((uint16_t)data) << (offset * 8);
+                keyboard->keyboard_out &= 0x03FF;
+                if (!offset)
+                    keyboard->RecalculateKI();
+            },
+            emulator);
 
         if (!real_hardware) {
             keyboard_pd_emu = emulator.GetModelInfo("pd_value");

emulator/src/Peripheral/Timer.cpp

@@ -26,12 +26,17 @@ namespace casioemu {
             emulator);
 
         region_control.Setup(
-            0xF025, 1, "Timer/Control", this, [](MMURegion *region, size_t) {
-			Timer *timer = (Timer *)region->userdata;
-			return (uint8_t)(timer->data_control & 0x01); }, [](MMURegion *region, size_t, uint8_t data) {
-			Timer *timer = (Timer *)region->userdata;
-			timer->data_control = data & 0x01;
-			timer->raise_required = false; }, emulator);
+            0xF025, 1, "Timer/Control", this,
+            [](MMURegion *region, size_t) {
+                Timer *timer = (Timer *)region->userdata;
+                return (uint8_t)(timer->data_control & 0x01);
+            },
+            [](MMURegion *region, size_t, uint8_t data) {
+                Timer *timer = (Timer *)region->userdata;
+                timer->data_control = data & 0x01;
+                timer->raise_required = false;
+            },
+            emulator);
 
         region_F024.Setup(0xF024, 1, "Timer/Unknown/F024*1", &data_F024, MMURegion::DefaultRead<uint8_t>, MMURegion::DefaultWrite<uint8_t>, emulator);
     }