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

Remove the asm_processor #62

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Remove the asm_processor #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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 @@ -248,7 +248,7 @@ def LinkedFor(*versions):
Object(LinkedFor("oot-j", "oot-u", "oot-e"), "emulator/pi.c"),
Object(LinkedFor("oot-j", "oot-u", "oot-e"), "emulator/mi.c"),
Object(LinkedFor("oot-j", "oot-u", "oot-e"), "emulator/disk.c"),
Object(NotLinked, "emulator/cpu.c", asm_processor=True),
Object(NotLinked, "emulator/cpu.c"),
Object(LinkedFor("oot-j", "oot-u", "oot-e"), "emulator/pif.c"),
Object(LinkedFor("oot-j", "oot-u", "oot-e"), "emulator/ram.c"),
Object(LinkedFor("oot-j", "oot-u", "oot-e"), "emulator/rom.c"),
Expand Down
2 changes: 1 addition & 1 deletion src/emulator/_buildtev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ s32 AddAlphaTevOrder(CombineModeTev* tvP, s32 foundTypes, s32 curStage) {
return ret;
}

#pragma GLOBAL_ASM("asm/non_matchings/_buildtev/SetupStage.s")
// SetupStage

void BuildCycle(CombineModeTev* tvP, u8 (*stageValues)[4]) {
s32 numCParts;
Expand Down
2 changes: 0 additions & 2 deletions src/emulator/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,6 @@ static void cpuCompileNOP(s32* anCode, s32* iCode, s32 number) {

#ifndef NON_MATCHING
static bool fn_8000E734(Cpu* pCPU, s32 arg1, s32 arg2, s32 arg3);
// #pragma GLOBAL_ASM("asm/non_matchings/cpu/fn_8000E734.s")
#else
static bool fn_8000E734(Cpu* pCPU, s32 arg1, s32 arg2, s32 arg3) {
if (gpSystem->eTypeROM == CLBJ || gpSystem->eTypeROM == CLBE || gpSystem->eTypeROM == CLBP) {
Expand Down Expand Up @@ -1602,7 +1601,6 @@ s32 fn_8000E81C(Cpu* pCPU, s32 arg1, s32 arg2, s32 arg3, s32 arg5, s32* arg6, s3
* @return bool true on success, false otherwise.
*/
static bool cpuGetPPC(Cpu* pCPU, s32* pnAddress, CpuFunction* pFunction, s32* anCode, s32* piCode, bool bSlot);
// #pragma GLOBAL_ASM("asm/non_matchings/cpu/cpuGetPPC.s")

//! TODO: remove NO_INLINE once this is matched
static bool fn_80031D4C(Cpu* pCPU, CpuFunction* pFunction, s32 unknown) NO_INLINE { return false; }
Expand Down
Loading