Skip to content
This repository has been archived by the owner on Jul 20, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/LumaTeam/Luma3DS into off…
Browse files Browse the repository at this point in the history
…icial
  • Loading branch information
PabloMK7 committed Jun 5, 2022
2 parents 937409b + 2c184cf commit 7d438e2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
2 changes: 1 addition & 1 deletion arm9/source/start.s
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 4 additions & 12 deletions sysmodules/rosalina/source/gdb/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion sysmodules/rosalina/source/menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,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;
}

Expand Down

0 comments on commit 7d438e2

Please sign in to comment.