Merge branch 'official' into 3gx-loader

PabloMK7 · Jun 5, 2022 · 73cefa0 · 73cefa0
2 parents b511ff1 + 7d438e2
commit 73cefa0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/arm9/source/start.s b/arm9/source/start.s
@@ -160,7 +160,7 @@ disableMpuAndJumpToEntrypoints:
     @ Jump to the Arm9 entrypoint
     mov r0, r4
     mov r1, r5
-    ldr r2, =0x3BEEF
+    ldr r2, =0x4BEEF
     bx r6
 
 .pool
diff --git a/sysmodules/rosalina/source/gdb/debug.c b/sysmodules/rosalina/source/gdb/debug.c
@@ -546,20 +546,13 @@ int GDB_SendStopReply(GDBContext *ctx, const DebugEventInfo *info)
                     switch(exc.stop_point.type)
                     {
                         case STOPPOINT_SVC_FF:
-                        {
-                            GDB_ParseCommonThreadInfo(buffer, ctx, SIGTRAP);
-                            return GDB_SendFormattedPacket(ctx, "%sswbreak:;", buffer);
-                            break;
-                        }
-
                         case STOPPOINT_BREAKPOINT:
                         {
-                            // Note: this includes both "bkpt" and hw breakpoints, but we never use the latter...
-                            // However, since our GDB executable only knows about svc 0xFF as sw breakpoint for the 3DS ABI,
-                            // we can use swbreak as reason (it'll dismiss the bkpt instruction and try to auto-step over it).
+                            // Note: STOPPOINT_BREAKPOINT includes both "bkpt" and hw breakpoints, but we never use the latter...
+                            // Use swbreak as a reason for both 'svc 0xFF' and 'bkpt' too (GDB doc mention we should use 'swbreak'
+                            // even if the breakpoint was already present/hardcoded).
                             GDB_ParseCommonThreadInfo(buffer, ctx, SIGTRAP);
-                            return GDB_SendFormattedPacket(ctx, "%s", buffer);
-                            break;
+                            return GDB_SendFormattedPacket(ctx, "%sswbreak:;", buffer);
                         }
 
                         case STOPPOINT_WATCHPOINT:
@@ -571,7 +564,6 @@ int GDB_SendStopReply(GDBContext *ctx, const DebugEventInfo *info)
 
                             GDB_ParseCommonThreadInfo(buffer, ctx, SIGTRAP);
                             return GDB_SendFormattedPacket(ctx, "%s%swatch:%08lx;", buffer, kinds[(u32)kind], exc.stop_point.fault_information);
-                            break;
                         }
 
                         default:

diff --git a/sysmodules/rosalina/source/menu.c b/sysmodules/rosalina/source/menu.c
@@ -176,7 +176,7 @@ static Result menuUpdateMcuInfo(void)
         batteryPercentage = (u32)((batteryPercentage + 0.05f) * 10.0f) / 10.0f;
 
         // Round battery voltage to 0.01V
-        batteryVoltage = (5u * data[3]) / 256.0f;
+        batteryVoltage = 0.02f * data[3];
         batteryVoltage = (u32)((batteryVoltage + 0.005f) * 100.0f) / 100.0f;
     }