diff options
| author | Max <mparisi@stevens.edu> | 2020-09-20 14:21:21 -0400 |
|---|---|---|
| committer | Max <mparisi@stevens.edu> | 2020-09-20 14:21:21 -0400 |
| commit | 94f61df1e672fb3cdc91947b582f028ddf3bf7cd (patch) | |
| tree | a8b49d4e3e0f075c1478ae479a25defadca45705 /asm/SDK/OS/OS.s | |
| parent | df637d39af469c45fed750d94a3b16f10be363c5 (diff) | |
| parent | c69681b46b7bc23e0eb42ad85f259d1839bed48d (diff) | |
resolve merge conflict
Diffstat (limited to 'asm/SDK/OS/OS.s')
| -rw-r--r-- | asm/SDK/OS/OS.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/SDK/OS/OS.s b/asm/SDK/OS/OS.s index e67fdc0..fc69331 100644 --- a/asm/SDK/OS/OS.s +++ b/asm/SDK/OS/OS.s @@ -1061,7 +1061,7 @@ OSExceptionInit: /* 80269230 00264E90 7C 08 02 A6 */ mflr r0 /* 80269234 00264E94 90 01 00 44 */ stw r0, 0x44(r1) /* 80269238 00264E98 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026923C 00264E9C 4B F5 DE D1 */ bl func_801C710C +/* 8026923C 00264E9C 4B F5 DE D1 */ bl _savegpr_20 /* 80269240 00264EA0 3E C0 80 00 */ lis r22, 0x80000060@ha /* 80269244 00264EA4 3F 40 80 27 */ lis r26, OSExceptionVector@ha /* 80269248 00264EA8 80 16 00 60 */ lwz r0, 0x80000060@l(r22) |