git.y1.nz

commit 5e119548e9ac0a1b034ac477fd2f6d835efaa94c
parent 0925b0655566cb8c1902375733c4df938c3d96c2
Author: Lior Halphon <LIJI32@gmail.com>
Date:   Wed,  9 Mar 2022 00:32:50 +0200

GDMA during mode 3 writes to both banks, list AGB_E as a future model

Diffstat:
M
Cocoa/Preferences.xib
13
+++++++------
M
Core/gb.h
1
+
M
Core/memory.c
18
+++++++++++++-----

3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/Cocoa/Preferences.xib b/Cocoa/Preferences.xib
@@ -524,14 +524,15 @@
                 <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3Dl-S6-O7c">
                     <rect key="frame" x="30" y="17" width="257" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                    <popUpButtonCell key="cell" type="push" title="CPU AGB A" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="519" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" selectedItem="8bk-wP-Cbr" id="EhC-I2-5Th">
+                    <popUpButtonCell key="cell" type="push" title="CPU AGB 0 (Early GBA)" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" tag="518" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" selectedItem="75z-Yy-XaY" id="EhC-I2-5Th">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="menu"/>
                         <menu key="menu" autoenablesItems="NO" id="b2b-jo-SrI">
                             <items>
-                                <menuItem title="CPU AGB 0" tag="518" enabled="NO" id="75z-Yy-XaY"/>
-                                <menuItem title="CPU AGB A" state="on" tag="519" id="8bk-wP-Cbr"/>
-                                <menuItem title="CPU AGB B (Game Boy Advance SP)" tag="520" enabled="NO" id="jIE-v4-768"/>
+                                <menuItem title="CPU AGB 0 (Early GBA)" tag="518" enabled="NO" id="75z-Yy-XaY"/>
+                                <menuItem title="CPU AGB A (GBA, GB Player)" state="on" tag="519" id="8bk-wP-Cbr"/>
+                                <menuItem title="CPU AGB B (GBA SP)" tag="520" enabled="NO" id="jIE-v4-768"/>
+                                <menuItem title="CPU AGB E (Late GBA SP, GB Player)" tag="521" enabled="NO" id="w7s-kh-HaZ"/>
                             </items>
                         </menu>
                     </popUpButtonCell>
@@ -636,7 +637,7 @@
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <clipView key="contentView" focusRingType="none" ambiguous="YES" drawsBackground="NO" id="AMs-PO-nid">
                         <rect key="frame" x="1" y="1" width="255" height="209"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" id="UDd-IJ-fxX">
                                 <rect key="frame" x="0.0" y="0.0" width="255" height="209"/>
@@ -1112,7 +1113,7 @@
         </customObject>
     </objects>
     <resources>
-        <image name="AppIcon" width="128" height="128"/>
+        <image name="AppIcon" width="512" height="512"/>
         <image name="CPU" width="32" height="32"/>
         <image name="Display" width="32" height="32"/>
         <image name="Joypad" width="32" height="32"/>
diff --git a/Core/gb.h b/Core/gb.h
@@ -119,6 +119,7 @@ typedef enum {
     GB_MODEL_AGB_A = 0x207,
     GB_MODEL_AGB = GB_MODEL_AGB_A,
     //GB_MODEL_AGB_B = 0x208
+    //GB_MODEL_AGB_E = 0x209
 } GB_model_t;
 
 enum {
diff --git a/Core/memory.c b/Core/memory.c
@@ -1796,8 +1796,13 @@ void GB_hdma_run(GB_gameboy_t *gb)
         }
         gb->hdma_current_src++;
         GB_advance_cycles(gb, cycles);
-        if (gb->addr_for_hdma_conflict == 0xFFFF /* || (gb->model == GB_MODEL_AGB_B && gb->cgb_double_speed) */) {
-            gb->vram[vram_base + (gb->hdma_current_dest++ & 0x1FFF)] = byte;
+        if (gb->addr_for_hdma_conflict == 0xFFFF /* || (gb->model >= GB_MODEL_AGB_B && gb->cgb_double_speed) */) {
+            uint16_t addr = (gb->hdma_current_dest++ & 0x1FFF);
+            gb->vram[vram_base + addr] = byte;
+            // TODO: vram_write_blocked might not be the correct timing
+            if (gb->vram_write_blocked /* && gb->model < GB_MODEL_AGB_B */) {
+                gb->vram[(vram_base ^ 0x2000) + addr] = byte;
+            }
         }
         else {
             if (gb->model == GB_MODEL_CGB_E || gb->cgb_double_speed) {
@@ -1805,9 +1810,12 @@ void GB_hdma_run(GB_gameboy_t *gb)
                     These corruptions revision (unit?) specific in single speed. They happen only on my CGB-E.
                 */
                 gb->addr_for_hdma_conflict &= 0x1FFF;
-                // Can't write to even bitmap bytes in single speed mode
-                if (gb->cgb_double_speed || gb->addr_for_hdma_conflict >= 0x1900 || (gb->addr_for_hdma_conflict & 1)) {
-                    gb->vram[vram_base + (gb->hdma_current_dest & gb->addr_for_hdma_conflict & 0x1FFF)] = byte;
+                // TODO: there are *some* scenarions in single speed mode where this write doesn't happen. What's the logic?
+                uint16_t addr = (gb->hdma_current_dest & gb->addr_for_hdma_conflict & 0x1FFF);
+                gb->vram[vram_base + addr] = byte;
+                // TODO: vram_write_blocked might not be the correct timing
+                if (gb->vram_write_blocked /* && gb->model < GB_MODEL_AGB_B */) {
+                    gb->vram[(vram_base ^ 0x2000) + addr] = byte;
                 }
             }
             gb->hdma_current_dest++;

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.