Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match and link cpu.c on the other versions #200

Merged
merged 2 commits into from
Oct 24, 2024
Merged

Match and link cpu.c on the other versions #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e8db8d
match and link cpu.c for the other versions
Yanis002 Oct 24, 2024
2d7afd1
dol apply
Yanis002 Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions config/ce-e/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,3 +201,18 @@ block_relocations:
- source: 0x800301E0
- source: 0x800301F0
- source: 0x80030218
# cpu.c
- source: 0x800336BC
- source: 0x800336C4
- source: 0x80033724
- source: 0x8003372C
- source: 0x80033738
- source: 0x80033EC8
- source: 0x80033EF8
- source: 0x80033EFC
- source: 0x80033F30
- source: 0x80033F44
- source: 0x80033F84
- source: 0x80033F88
- source: 0x80033FBC
- source: 0x80033FD0
496 changes: 248 additions & 248 deletions config/ce-e/symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

312 changes: 156 additions & 156 deletions config/ce-j/symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

526 changes: 263 additions & 263 deletions config/ce-u/symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

690 changes: 347 additions & 343 deletions config/mq-e/symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions config/mq-j/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ emulator/system.c:
emulator/cpu.c:
.text start:0x80030724 end:0x8006B6F0
.data start:0x800ECB20 end:0x800EEB80
.bss start:0x80131DB8 end:0x80186FB0
.bss start:0x80131DB8 end:0x80131FB0
.sdata start:0x8018B340 end:0x8018B500
.sbss start:0x8018B970 end:0x8018B9F0
.sdata2 start:0x8018C1E0 end:0x8018C210
Expand Down Expand Up @@ -219,7 +219,7 @@ emulator/_frameGCNcc.c:
emulator/_buildtev.c:
.text start:0x80097E6C end:0x8009B284
.data start:0x800F1920 end:0x800F1AE8
.bss start:0x80186FB0 end:0x80187280
.bss start:0x80131FB0 end:0x80187280
.sdata start:0x8018B690 end:0x8018B6A0
.sdata2 start:0x8018C318 end:0x8018C320

Expand Down
659 changes: 373 additions & 286 deletions config/mq-j/symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

714 changes: 358 additions & 356 deletions config/mq-u/symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def LinkedFor(*versions):
Object(Linked, "emulator/soundGCN.c"),
Object(LinkedFor("ce-j"), "emulator/frame.c", asm_processor=True),
Object(Linked, "emulator/system.c"),
Object(LinkedFor("ce-j"), "emulator/cpu.c"),
Object(Linked, "emulator/cpu.c"),
Object(Linked, "emulator/pif.c"),
Object(Linked, "emulator/ram.c"),
Object(Linked, "emulator/rom.c"),
Expand Down
4 changes: 2 additions & 2 deletions src/emulator/_cpuGCN.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8318,7 +8318,7 @@ static s32 cpuExecuteLoadStore(Cpu* pCPU, s32 nCount, s32 nAddressN64, s32 nAddr
anCode[count++] = 0x90070000 | (iRegisterA << 21) | MIPS_IMM_U16(*opcode);
break;
default:
OSPanic("_cpuGCN.c", 4725, "");
OSPanic("_cpuGCN.c", VERSION == MQ_J ? 4721 : 4725, "");
break;
}
} else {
Expand Down Expand Up @@ -8540,7 +8540,7 @@ static s32 cpuExecuteLoadStoreF(Cpu* pCPU, s32 nCount, s32 nAddressN64, s32 nAdd
anCode[count++] = 0x90070000 | (iRegisterA << 21) | (MIPS_IMM_U16(*opcode) + 4);
break;
default:
OSPanic("_cpuGCN.c", 5181, "");
OSPanic("_cpuGCN.c", VERSION == MQ_J ? 5177 : 5181, "");
break;
}
} else {
Expand Down