Emulation/daedalus
1
0
Fork 0
mirror of https://github.com/DaedalusX64/daedalus.git synced 2024-05-18 03:50:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

This is really sensitive.. revert it,

Browse source
This commit is contained in:
Wally4000 2023-10-15 14:58:00 +11:00
parent 3d4db59417
commit 27218873d0
5 changed files with 51 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Daedalus.cia
View file

Binary file not shown.

10
Source/CMakeLists.txt
View file

@ -26,7 +26,7 @@ list(APPEND plat_main )
set(CMAKE_BUILD_TYPE Release)
endif(NOT APPLE)
add_compile_definitions(DAEDALUS_CONFIG_VERSION="Release") ## Perhaps we can remove this. It's only used in the PSP UI and model doesn't matter as much
add_compile_definitions("O2")
add_compile_definitions("O3")
add_compile_definitions("flto")
endif()
@ -66,7 +66,8 @@ list(APPEND plat_main )
option(DAEDALUS_BATCH_TEST_ENABLED "Enable batch testing for compatibility" OFF)
option(DAEDALUS_ENABLE_OS_HOOKS "Enable High Level Emulation Hooks" ON) ## Per platform?
option(DAEDALUS_COMPRESSED_ROM_SUPPORT "Enable Compressed ROM `Support" OFF) ## Probably should be a default option.
option(DAEDALUS_SILENT "Shhh, no debug console message, on by default" ON)
option(DAEDALUS_SILENT "Shhh, no debug console message, on by default" OFF)
option(DAEDALUS_LOG "Log stuff " ON) ## NEeds to be off on the PSP unless debugging
# Additional Debug Options
option(SHOW_MEM "Show memory usage" OFF)
@ -114,8 +115,6 @@ list(APPEND plat_main )
option(DAEDALUS_CTR "3DS Specific Options" ON)
option(DAEDALUS_ENABLE_DYNAREC "Enable Dynamic Recompilation" ON)
option(DAEDALUS_ENABLE_OS_HOOKS " High Level Emulation Hooks" ON)
option(DAEDALUS_DEBUG_CONSOLE "Debug Console" ON)
option(DAEDALUS_SILENT "Nah" OFF)
endif()
if(DAEDALUS_SDL)
@ -222,10 +221,11 @@ if(WIN32)
add_subdirectory(SysPSP)
endif()
# --- Build ----
add_executable(daedalus ${plat_main})
list(APPEND default_libraries png z) ## Required Libraries
target_include_directories(daedalus BEFORE PUBLIC ${include_dirs})
target_link_libraries(daedalus PRIVATE ${daed_libs} ${default_libraries} ${sys_libraries} )

50
Source/Core/CPU.cpp
View file

@ -673,7 +673,7 @@ void CPU_HANDLE_COUNT_INTERRUPT()
// interrupt the dynamo tracer for instance)
// TODO(strmnnrmn): should register this with CPU_RegisterVblCallback.
if ((gVerticalInterrupts & 0x3F) == 0) // once every 60 VBLs
Save_Flush();
// Save_Flush();
//TESTING
for (size_t i = 0; i < gVblCallbacks.size(); ++i)
@ -859,32 +859,30 @@ bool CPU_CheckStuffToDo()
}
// Process Interrupts/Exceptions on a priority basis using a switch statement
switch (stuff_to_do) {
case CPU_CHECK_INTERRUPTS:
R4300_Handle_Interrupt();
gCPUState.ClearJob(CPU_CHECK_INTERRUPTS);
break;
case CPU_CHECK_EXCEPTIONS:
R4300_Handle_Exception();
gCPUState.ClearJob(CPU_CHECK_EXCEPTIONS);
break;
case CPU_CHANGE_CORE:
gCPUState.ClearJob(CPU_CHANGE_CORE);
return true;
case CPU_STOP_RUNNING:
gCPUState.ClearJob(CPU_STOP_RUNNING);
gCPURunning = false;
return true;
default:
break;
}
if( gCPUState.GetStuffToDo() & CPU_CHECK_INTERRUPTS )
{
R4300_Handle_Interrupt();
gCPUState.ClearJob( CPU_CHECK_INTERRUPTS );
}
else if( gCPUState.GetStuffToDo() & CPU_CHECK_EXCEPTIONS )
{
R4300_Handle_Exception();
gCPUState.ClearJob( CPU_CHECK_EXCEPTIONS );
}
else if( gCPUState.GetStuffToDo() & CPU_CHANGE_CORE )
{
gCPUState.ClearJob( CPU_CHANGE_CORE );
return true;
}
else if( gCPUState.GetStuffToDo() & CPU_STOP_RUNNING )
{
gCPUState.ClearJob( CPU_STOP_RUNNING );
gCPURunning = false;
return true;
}
// Clear stuff_to_do?
// Clear stuff_to_do if necessary
if (stuff_to_do & ~(CPU_CHECK_INTERRUPTS | CPU_CHECK_EXCEPTIONS)) {
gCPUState.ClearJob(stuff_to_do);
}
return false;
return false;
}
// FIX ME: This gets called alot

1
Source/SysCTR/Debug/DaedalusAssertCTR.cpp
View file

@ -21,6 +21,7 @@
#include <stdio.h>
#include "Base/Assert.h"
#ifdef DAEDALUS_ENABLE_ASSERTS

21
Tools/3dstoolchain.cmake Normal file
View file

@ -0,0 +1,21 @@
set(DEVKITPRO $ENV{DEVKITPRO})
set(CMAKE_SYSTEM_NAME "Generic")
set(CMAKE_SYSTEM_PROCESSOR "arm6k")
set(CMAKE_C_COMPILER "${DEVKITPRO}/devkitARM/bin/arm-none-eabi-gcc")
set(CMAKE_CXX_COMPILER "${DEVKITPRO}/devkitARM/bin/arm-none-eabi-g++")
set(CMAKE_AR "${DEVKITPRO}/devkitARM/bin/arm-none-eabi-gcc-ar" CACHE STRING "")
set(CMAKE_RANLIB "${DEVKITPRO}/devkitARM/bin/arm-none-eabi-gcc-ranlib" CACHE STRING "")
set(CMAKE_ASM_COMPILER "${DEVKITPRO}/devkitARM/bin/arm-none-eabi-gcc")
set(ARCH "-march=armv6k -mtune=mpcore -mfloat-abi=hard -mfpu=vfp -mtp=soft -D__3DS__")
set(CMAKE_C_FLAGS "${ARCH} -Wall -mword-relocations -O3 -fomit-frame-pointer -ffunction-sections -fdata-sections" CACHE STRING "C flags")
set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fno-rtti -fno-exceptions -std=gnu++14" CACHE STRING "C++ flags")
set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_FIND_ROOT_PATH ${DEVKITPRO}/devkitARM ${DEVKITPRO}/libctru ${DEVKITARM}/portlibs/3ds)
set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available")
include_directories(${DEVKITPRO}/libctru/include)
link_directories(${DEVKITPRO}/libctru/lib ${DEVKITPRO}/portlibs/3ds/lib)