Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@
"gxmanage.h": "c",
"__ax.h": "c",
"math_api.h": "c",
"arith.h": "c"
"arith.h": "c",
"card.h": "c",
"dvd.h": "c",
"cardpriv.h": "c",
"__card.h": "c",
"osexec.h": "c",
"oscache.h": "c"
},
// Disable C/C++ IntelliSense, use clangd instead
"C_Cpp.intelliSenseEngine": "default",
Expand Down
62 changes: 31 additions & 31 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -499,11 +499,11 @@ def MatchingFor(*versions):
Object(Matching, "dolphin/src/card/CARDFormat.c"),
Object(NonMatching, "dolphin/src/card/CARDOpen.c"),
Object(Matching, "dolphin/src/card/CARDCreate.c"),
Object(NonMatching, "dolphin/src/card/CARDRead.c"),
Object(Matching, "dolphin/src/card/CARDRead.c"),
Object(Matching, "dolphin/src/card/CARDWrite.c"),
Object(Matching, "dolphin/src/card/CARDDelete.c"),
Object(NonMatching, "dolphin/src/card/CARDStat.c"),
Object(NonMatching,"dolphin/src/card/CARDStatEx.c"),
Object(Matching, "dolphin/src/card/CARDStat.c"),
Object(Matching,"dolphin/src/card/CARDStatEx.c"),
Object(NonMatching, "dolphin/src/card/CARDNet.c"),
]
),
Expand All @@ -524,9 +524,9 @@ def MatchingFor(*versions):
DolphinLib(
"dvd",
[
Object(NonMatching, "dolphin/src/dvd/dvdlow.c"),
Object(NonMatching, "dolphin/src/dvd/dvdfs.c"),
Object(NonMatching, "dolphin/src/dvd/dvd.c"),
Object(Matching, "dolphin/src/dvd/dvdlow.c"),
Object(Matching, "dolphin/src/dvd/dvdfs.c"),
Object(Matching, "dolphin/src/dvd/dvd.c"),
Object(Matching, "dolphin/src/dvd/dvdqueue.c"),
Object(Matching, "dolphin/src/dvd/dvderror.c"),
Object(Matching, "dolphin/src/dvd/dvdidutils.c"),
Expand All @@ -545,20 +545,20 @@ def MatchingFor(*versions):
"gx",
[
Object(NonMatching, "dolphin/src/gx/GXInit.c"),
Object(NonMatching, "dolphin/src/gx/GXFifo.c"),
Object(NonMatching, "dolphin/src/gx/GXFifo.c"), # Code Match
Object(NonMatching, "dolphin/src/gx/GXAttr.c"),
Object(NonMatching, "dolphin/src/gx/GXMisc.c"),
Object(Matching, "dolphin/src/gx/GXMisc.c"),
Object(NonMatching, "dolphin/src/gx/GXGeometry.c"),
Object(NonMatching, "dolphin/src/gx/GXFrameBuf.c"),
Object(Matching, "dolphin/src/gx/GXFrameBuf.c"),
Object(NonMatching, "dolphin/src/gx/GXLight.c"),
Object(NonMatching, "dolphin/src/gx/GXTexture.c"),
Object(Matching, "dolphin/src/gx/GXTexture.c"),
Object(NonMatching, "dolphin/src/gx/GXBump.c"),
Object(NonMatching, "dolphin/src/gx/GXTev.c"),
Object(NonMatching, "dolphin/src/gx/GXPixel.c"),
Object(NonMatching, "dolphin/src/gx/GXDraw.c"),
Object(NonMatching, "dolphin/src/gx/GXDisplayList.c"),
Object(Matching, "dolphin/src/gx/GXDisplayList.c"),
Object(NonMatching, "dolphin/src/gx/GXTransform.c"),
Object(NonMatching, "dolphin/src/gx/GXPerf.c")
Object(Matching, "dolphin/src/gx/GXPerf.c")
]
),
DolphinLib(
Expand All @@ -583,50 +583,50 @@ def MatchingFor(*versions):
DolphinLib(
"odenotstub",
[
Object(NonMatching, "dolphin/src/odenotstub/odenotstub.c")
Object(Matching, "dolphin/src/odenotstub/odenotstub.c")
]
),
DolphinLib(
"os",
[
Object(NonMatching, "dolphin/src/os/OS.c"),
Object(NonMatching, "dolphin/src/os/OSAlarm.c"),
Object(NonMatching, "dolphin/src/os/OSAlloc.c"),
Object(NonMatching, "dolphin/src/os/OSArena.c"),
Object(NonMatching, "dolphin/src/os/OSAudioSystem.c"),
Object(NonMatching, "dolphin/src/os/OSCache.c"),
Object(NonMatching, "dolphin/src/os/OSContext.c"),
Object(Matching, "dolphin/src/os/OSAlarm.c"),
Object(Matching, "dolphin/src/os/OSAlloc.c"),
Object(Matching, "dolphin/src/os/OSArena.c"),
Object(Matching, "dolphin/src/os/OSAudioSystem.c"),
Object(Matching, "dolphin/src/os/OSCache.c"),
Object(Matching, "dolphin/src/os/OSContext.c"),
Object(NonMatching, "dolphin/src/os/OSError.c"),
Object(NonMatching, "dolphin/src/os/OSExec.c"),
Object(NonMatching, "dolphin/src/os/OSFont.c"),
Object(NonMatching, "dolphin/src/os/OSInterrupt.c"),
Object(NonMatching, "dolphin/src/os/OSLink.c"),
Object(NonMatching, "dolphin/src/os/OSMemory.c"),
Object(NonMatching, "dolphin/src/os/OSMutex.c"),
Object(Matching, "dolphin/src/os/OSInterrupt.c"),
Object(Matching, "dolphin/src/os/OSLink.c"),
Object(Matching, "dolphin/src/os/OSMemory.c"),
Object(Matching, "dolphin/src/os/OSMutex.c"),
Object(NonMatching, "dolphin/src/os/OSReboot.c"),
Object(NonMatching, "dolphin/src/os/OSReset.c"),
Object(NonMatching, "dolphin/src/os/OSResetSW.c"),
Object(NonMatching, "dolphin/src/os/OSRtc.c"),
Object(Matching, "dolphin/src/os/OSResetSW.c"),
Object(Matching, "dolphin/src/os/OSRtc.c"),
Object(NonMatching, "dolphin/src/os/OSThread.c"),
Object(NonMatching, "dolphin/src/os/OSTime.c"),
Object(NonMatching, "dolphin/src/os/OSSemaphore.c"),
Object(NonMatching, "dolphin/src/os/OSSync.c"),
Object(Matching, "dolphin/src/os/OSTime.c"),
Object(Matching, "dolphin/src/os/OSSemaphore.c"),
Object(Matching, "dolphin/src/os/OSSync.c"),
Object(NonMatching, "dolphin/src/os/init/__start.c"),
Object(NonMatching, "dolphin/src/os/init/__ppc_eabi_init.cpp")
]
),
DolphinLib(
"pad",
[
Object(NonMatching, "dolphin/src/pad/Padclamp.c"),
Object(NonMatching, "dolphin/src/pad/Pad.c")
Object(Matching, "dolphin/src/pad/Padclamp.c"),
Object(Matching, "dolphin/src/pad/Pad.c")
]
),
DolphinLib(
"si",
[
Object(NonMatching, "dolphin/src/si/SIBios.c"),
Object(NonMatching, "dolphin/src/si/SISamplingRate.c"),
Object(Matching, "dolphin/src/si/SISamplingRate.c"),
]
),
DolphinLib(
Expand Down
5 changes: 5 additions & 0 deletions src/dolphin/include/dolphin/os/OSCache.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ void DCZeroRange(void* addr, u32 nBytes);
void DCTouchRange(void* addr, u32 nBytes);
void ICInvalidateRange(void* addr, u32 nBytes);

// Instruction cache functions.
void ICInvalidateRange(void* addr, u32 numBytes);
void ICFlashInvalidate();
void ICEnable();

#define LC_BASE_PREFIX 0xE000
#define LC_BASE (LC_BASE_PREFIX << 16)
#define LCGetBase() ((void*)LC_BASE)
Expand Down
Loading