Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-08 07:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Don't force users to load rom from terminal or by dragging and dropping onto executable file. Instead, open a blank window and use SDL's drag&drop feature

Browse source
This commit is contained in:
SimoneN64 2023-07-10 20:48:13 +02:00 • committed by wheremyfoodat
parent 008f0bfb84
commit 6ce861624d
5 changed files with 179 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/emulator.hpp
View file

@ -47,7 +47,7 @@ class Emulator {
static constexpr u32 width = 400; static constexpr u32 width = 400;
static constexpr u32 height = 240 * 2; // * 2 because 2 screens static constexpr u32 height = 240 * 2; // * 2 because 2 screens
ROMType romType = ROMType::None; ROMType romType = ROMType::None;
bool running = true; bool running = true, romLoaded = false;
#ifdef PANDA3DS_ENABLE_HTTP_SERVER #ifdef PANDA3DS_ENABLE_HTTP_SERVER
HttpServer httpServer; HttpServer httpServer;
@ -64,6 +64,7 @@ class Emulator {
Emulator(); Emulator();
~Emulator(); ~Emulator();
void stop();
void step(); void step();
void render(); void render();
void reset(); void reset();

1
include/services/gsp_gpu.hpp
View file

@ -22,6 +22,7 @@ enum class GPUInterrupt : u8 {
class Kernel; class Kernel;
class GPUService { class GPUService {
bool registerInterruptRelayQueueBeenHere = false;
Handle handle = KernelHandles::GPU; Handle handle = KernelHandles::GPU;
Memory& mem; Memory& mem;
GPU& gpu; GPU& gpu;

6
src/core/services/gsp_gpu.cpp
View file

@ -34,6 +34,7 @@ void GPUService::reset() {
privilegedProcess = 0xFFFFFFFF; // Set the privileged process to an invalid handle privilegedProcess = 0xFFFFFFFF; // Set the privileged process to an invalid handle
interruptEvent = std::nullopt; interruptEvent = std::nullopt;
sharedMem = nullptr; sharedMem = nullptr;
registerInterruptRelayQueueBeenHere = false;
} }
void GPUService::handleSyncRequest(u32 messagePointer) { void GPUService::handleSyncRequest(u32 messagePointer) {
@ -77,9 +78,8 @@ void GPUService::acquireRight(u32 messagePointer) {
// How does the shared memory handle thing work? // How does the shared memory handle thing work?
void GPUService::registerInterruptRelayQueue(u32 messagePointer) { void GPUService::registerInterruptRelayQueue(u32 messagePointer) {
// Detect if this function is called a 2nd time because we'll likely need to impl threads properly for the GSP // Detect if this function is called a 2nd time because we'll likely need to impl threads properly for the GSP
static bool beenHere = false; if (registerInterruptRelayQueueBeenHere) Helpers::panic("RegisterInterruptRelayQueue called a second time. Need to implement GSP threads properly");
if (beenHere) Helpers::panic("RegisterInterruptRelayQueue called a second time. Need to implement GSP threads properly"); registerInterruptRelayQueueBeenHere = true;
beenHere = true;
const u32 flags = mem.read32(messagePointer + 4); const u32 flags = mem.read32(messagePointer + 4);
const u32 eventHandle = mem.read32(messagePointer + 12); const u32 eventHandle = mem.read32(messagePointer + 12);

304
src/emulator.cpp
View file

@ -59,7 +59,7 @@ Emulator::Emulator() : kernel(cpu, memory, gpu), cpu(memory, kernel), gpu(memory
Emulator::~Emulator() { config.save(std::filesystem::current_path() / "config.toml"); } Emulator::~Emulator() { config.save(std::filesystem::current_path() / "config.toml"); }
void Emulator::reset() { void Emulator::stop() {
cpu.reset(); cpu.reset();
gpu.reset(); gpu.reset();
memory.reset(); memory.reset();
@ -69,7 +69,9 @@ void Emulator::reset() {
// Reloading r13 and r15 needs to happen after everything has been reset // Reloading r13 and r15 needs to happen after everything has been reset
// Otherwise resetting the kernel or cpu might nuke them // Otherwise resetting the kernel or cpu might nuke them
cpu.setReg(13, VirtualAddrs::StackTop); // Set initial SP cpu.setReg(13, VirtualAddrs::StackTop); // Set initial SP
}
void Emulator::reset() {
// If a ROM is active and we reset, reload it. This is necessary to set up stack, executable memory, .data/.rodata/.bss all over again // If a ROM is active and we reset, reload it. This is necessary to set up stack, executable memory, .data/.rodata/.bss all over again
if (romType != ROMType::None && romPath.has_value()) { if (romType != ROMType::None && romPath.has_value()) {
bool success = loadROM(romPath.value()); bool success = loadROM(romPath.value());
@ -90,18 +92,18 @@ void Emulator::run() {
httpServer.startHttpServer(); httpServer.startHttpServer();
#endif #endif
while (running) { while (running) {
#ifdef PANDA3DS_ENABLE_HTTP_SERVER
pollHttpServer();
#endif
runFrame(); // Run 1 frame of instructions
gpu.display(); // Display graphics
ServiceManager& srv = kernel.getServiceManager(); ServiceManager& srv = kernel.getServiceManager();
if(romLoaded) {
#ifdef PANDA3DS_ENABLE_HTTP_SERVER
pollHttpServer();
#endif
runFrame(); // Run 1 frame of instructions
gpu.display(); // Display graphics
// Send VBlank interrupts // Send VBlank interrupts
srv.sendGPUInterrupt(GPUInterrupt::VBlank0); srv.sendGPUInterrupt(GPUInterrupt::VBlank0);
srv.sendGPUInterrupt(GPUInterrupt::VBlank1); srv.sendGPUInterrupt(GPUInterrupt::VBlank1);
}
SDL_Event event; SDL_Event event;
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
namespace Keys = HID::Keys; namespace Keys = HID::Keys;
@ -113,104 +115,111 @@ void Emulator::run() {
return; return;
case SDL_KEYDOWN: case SDL_KEYDOWN:
switch (event.key.keysym.sym) { if(romLoaded) {
case SDLK_l: srv.pressKey(Keys::A); break; switch (event.key.keysym.sym) {
case SDLK_k: srv.pressKey(Keys::B); break; case SDLK_l: srv.pressKey(Keys::A); break;
case SDLK_o: srv.pressKey(Keys::X); break; case SDLK_k: srv.pressKey(Keys::B); break;
case SDLK_i: srv.pressKey(Keys::Y); break; case SDLK_o: srv.pressKey(Keys::X); break;
case SDLK_i: srv.pressKey(Keys::Y); break;
case SDLK_q: srv.pressKey(Keys::L); break; case SDLK_q: srv.pressKey(Keys::L); break;
case SDLK_p: srv.pressKey(Keys::R); break; case SDLK_p: srv.pressKey(Keys::R); break;
case SDLK_RIGHT: srv.pressKey(Keys::Right); break; case SDLK_RIGHT: srv.pressKey(Keys::Right); break;
case SDLK_LEFT: srv.pressKey(Keys::Left); break; case SDLK_LEFT: srv.pressKey(Keys::Left); break;
case SDLK_UP: srv.pressKey(Keys::Up); break; case SDLK_UP: srv.pressKey(Keys::Up); break;
case SDLK_DOWN: srv.pressKey(Keys::Down); break; case SDLK_DOWN: srv.pressKey(Keys::Down); break;
case SDLK_w: case SDLK_w:
srv.setCirclepadY(0x9C); srv.setCirclepadY(0x9C);
keyboardAnalogY = true; keyboardAnalogY = true;
break; break;
case SDLK_a: case SDLK_a:
srv.setCirclepadX(-0x9C); srv.setCirclepadX(-0x9C);
keyboardAnalogX = true; keyboardAnalogX = true;
break; break;
case SDLK_s: case SDLK_s:
srv.setCirclepadY(-0x9C); srv.setCirclepadY(-0x9C);
keyboardAnalogY = true; keyboardAnalogY = true;
break; break;
case SDLK_d: case SDLK_d:
srv.setCirclepadX(0x9C); srv.setCirclepadX(0x9C);
keyboardAnalogX = true; keyboardAnalogX = true;
break; break;
case SDLK_RETURN: srv.pressKey(Keys::Start); break; case SDLK_RETURN: srv.pressKey(Keys::Start); break;
case SDLK_BACKSPACE: srv.pressKey(Keys::Select); break; case SDLK_BACKSPACE: srv.pressKey(Keys::Select); break;
}
} }
break; break;
case SDL_KEYUP: case SDL_KEYUP:
switch (event.key.keysym.sym) { if(romLoaded) {
case SDLK_l: srv.releaseKey(Keys::A); break; switch (event.key.keysym.sym) {
case SDLK_k: srv.releaseKey(Keys::B); break; case SDLK_l: srv.releaseKey(Keys::A); break;
case SDLK_o: srv.releaseKey(Keys::X); break; case SDLK_k: srv.releaseKey(Keys::B); break;
case SDLK_i: srv.releaseKey(Keys::Y); break; case SDLK_o: srv.releaseKey(Keys::X); break;
case SDLK_i: srv.releaseKey(Keys::Y); break;
case SDLK_q: srv.releaseKey(Keys::L); break; case SDLK_q: srv.releaseKey(Keys::L); break;
case SDLK_p: srv.releaseKey(Keys::R); break; case SDLK_p: srv.releaseKey(Keys::R); break;
case SDLK_RIGHT: srv.releaseKey(Keys::Right); break; case SDLK_RIGHT: srv.releaseKey(Keys::Right); break;
case SDLK_LEFT: srv.releaseKey(Keys::Left); break; case SDLK_LEFT: srv.releaseKey(Keys::Left); break;
case SDLK_UP: srv.releaseKey(Keys::Up); break; case SDLK_UP: srv.releaseKey(Keys::Up); break;
case SDLK_DOWN: srv.releaseKey(Keys::Down); break; case SDLK_DOWN: srv.releaseKey(Keys::Down); break;
// Err this is probably not ideal // Err this is probably not ideal
case SDLK_w: case SDLK_w:
case SDLK_s: case SDLK_s:
srv.setCirclepadY(0); srv.setCirclepadY(0);
keyboardAnalogY = false; keyboardAnalogY = false;
break; break;
case SDLK_a: case SDLK_a:
case SDLK_d: case SDLK_d:
srv.setCirclepadX(0); srv.setCirclepadX(0);
keyboardAnalogX = false; keyboardAnalogX = false;
break; break;
case SDLK_RETURN: srv.releaseKey(Keys::Start); break; case SDLK_RETURN: srv.releaseKey(Keys::Start); break;
case SDLK_BACKSPACE: srv.releaseKey(Keys::Select); break; case SDLK_BACKSPACE: srv.releaseKey(Keys::Select); break;
} }
break; }
break;
case SDL_MOUSEBUTTONDOWN: {
if (event.button.button == SDL_BUTTON_LEFT) { case SDL_MOUSEBUTTONDOWN:
const s32 x = event.button.x; if(romLoaded) {
const s32 y = event.button.y; if (event.button.button == SDL_BUTTON_LEFT) {
const s32 x = event.button.x;
// Check if touch falls in the touch screen area const s32 y = event.button.y;
if (y >= 240 && y <= 480 && x >= 40 && x < 40 + 320) {
// Convert to 3DS coordinates // Check if touch falls in the touch screen area
u16 x_converted = static_cast<u16>(x) - 40; if (y >= 240 && y <= 480 && x >= 40 && x < 40 + 320) {
u16 y_converted = static_cast<u16>(y) - 240; // Convert to 3DS coordinates
u16 x_converted = static_cast<u16>(x) - 40;
srv.setTouchScreenPress(x_converted, y_converted); u16 y_converted = static_cast<u16>(y) - 240;
} else {
srv.releaseTouchScreen(); srv.setTouchScreenPress(x_converted, y_converted);
} else {
srv.releaseTouchScreen();
}
} else if (event.button.button == SDL_BUTTON_RIGHT) {
holdingRightClick = true;
} }
} else if (event.button.button == SDL_BUTTON_RIGHT) {
holdingRightClick = true;
} }
break; break;
}
case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONUP:
if (event.button.button == SDL_BUTTON_LEFT) { if(romLoaded) {
srv.releaseTouchScreen(); if (event.button.button == SDL_BUTTON_LEFT) {
} else if (event.button.button == SDL_BUTTON_RIGHT) { srv.releaseTouchScreen();
holdingRightClick = false; } else if (event.button.button == SDL_BUTTON_RIGHT) {
holdingRightClick = false;
}
} }
break; break;
@ -230,76 +239,90 @@ void Emulator::run() {
break; break;
case SDL_CONTROLLERBUTTONUP: case SDL_CONTROLLERBUTTONUP:
case SDL_CONTROLLERBUTTONDOWN: { case SDL_CONTROLLERBUTTONDOWN:
u32 key = 0; if(romLoaded) {
u32 key = 0;
switch (event.cbutton.button) { switch (event.cbutton.button) {
case SDL_CONTROLLER_BUTTON_A: key = Keys::B; break; case SDL_CONTROLLER_BUTTON_A: key = Keys::B; break;
case SDL_CONTROLLER_BUTTON_B: key = Keys::A; break; case SDL_CONTROLLER_BUTTON_B: key = Keys::A; break;
case SDL_CONTROLLER_BUTTON_X: key = Keys::Y; break; case SDL_CONTROLLER_BUTTON_X: key = Keys::Y; break;
case SDL_CONTROLLER_BUTTON_Y: key = Keys::X; break; case SDL_CONTROLLER_BUTTON_Y: key = Keys::X; break;
case SDL_CONTROLLER_BUTTON_LEFTSHOULDER: key = Keys::L; break; case SDL_CONTROLLER_BUTTON_LEFTSHOULDER: key = Keys::L; break;
case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: key = Keys::R; break; case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: key = Keys::R; break;
case SDL_CONTROLLER_BUTTON_DPAD_LEFT: key = Keys::Left; break; case SDL_CONTROLLER_BUTTON_DPAD_LEFT: key = Keys::Left; break;
case SDL_CONTROLLER_BUTTON_DPAD_RIGHT: key = Keys::Right; break; case SDL_CONTROLLER_BUTTON_DPAD_RIGHT: key = Keys::Right; break;
case SDL_CONTROLLER_BUTTON_DPAD_UP: key = Keys::Up; break; case SDL_CONTROLLER_BUTTON_DPAD_UP: key = Keys::Up; break;
case SDL_CONTROLLER_BUTTON_DPAD_DOWN: key = Keys::Down; break; case SDL_CONTROLLER_BUTTON_DPAD_DOWN: key = Keys::Down; break;
case SDL_CONTROLLER_BUTTON_BACK: key = Keys::Select; break; case SDL_CONTROLLER_BUTTON_BACK: key = Keys::Select; break;
case SDL_CONTROLLER_BUTTON_START: key = Keys::Start; break; case SDL_CONTROLLER_BUTTON_START: key = Keys::Start; break;
} }
if (key != 0) { if (key != 0) {
if (event.cbutton.state == SDL_PRESSED) { if (event.cbutton.state == SDL_PRESSED) {
srv.pressKey(key); srv.pressKey(key);
} else { } else {
srv.releaseKey(key); srv.releaseKey(key);
}
} }
} }
} break;
// Detect mouse motion events for gyroscope emulation // Detect mouse motion events for gyroscope emulation
case SDL_MOUSEMOTION: { case SDL_MOUSEMOTION:
// We use right click to indicate we want to rotate the console. If right click is not held, then this is not a gyroscope rotation if(romLoaded) {
if (!holdingRightClick) break; // We use right click to indicate we want to rotate the console. If right click is not held, then this is not a gyroscope rotation
if (!holdingRightClick) break;
// Relative motion since last mouse motion event // Relative motion since last mouse motion event
const s32 motionX = event.motion.xrel; const s32 motionX = event.motion.xrel;
const s32 motionY = event.motion.yrel; const s32 motionY = event.motion.yrel;
// The gyroscope involves lots of weird math I don't want to bother with atm // The gyroscope involves lots of weird math I don't want to bother with atm
// So up until then, we will set the gyroscope euler angles to fixed values based on the direction of the relative motion // So up until then, we will set the gyroscope euler angles to fixed values based on the direction of the relative motion
const s32 roll = motionX > 0 ? 0x7f : -0x7f; const s32 roll = motionX > 0 ? 0x7f : -0x7f;
const s32 pitch = motionY > 0 ? 0x7f : -0x7f; const s32 pitch = motionY > 0 ? 0x7f : -0x7f;
srv.setRoll(roll); srv.setRoll(roll);
srv.setPitch(pitch); srv.setPitch(pitch);
}
break; break;
case SDL_DROPFILE: {
char *droppedDir = event.drop.file;
if(droppedDir) {
loadROM(droppedDir);
SDL_free(droppedDir);
}
} }
break;
} }
} }
if (gameController != nullptr) { if(romLoaded) {
const s16 stickX = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_LEFTX); if (gameController != nullptr) {
const s16 stickY = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_LEFTY); const s16 stickX = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_LEFTX);
constexpr s16 deadzone = 3276; const s16 stickY = SDL_GameControllerGetAxis(gameController, SDL_CONTROLLER_AXIS_LEFTY);
constexpr s16 maxValue = 0x9C; constexpr s16 deadzone = 3276;
constexpr s16 div = 0x8000 / maxValue; constexpr s16 maxValue = 0x9C;
constexpr s16 div = 0x8000 / maxValue;
// Avoid overriding the keyboard's circlepad input // Avoid overriding the keyboard's circlepad input
if (abs(stickX) < deadzone && !keyboardAnalogX) { if (abs(stickX) < deadzone && !keyboardAnalogX) {
srv.setCirclepadX(0); srv.setCirclepadX(0);
} else { } else {
srv.setCirclepadX(stickX / div); srv.setCirclepadX(stickX / div);
} }
if (abs(stickY) < deadzone && !keyboardAnalogY) { if (abs(stickY) < deadzone && !keyboardAnalogY) {
srv.setCirclepadY(0); srv.setCirclepadY(0);
} else { } else {
srv.setCirclepadY(-(stickY / div)); srv.setCirclepadY(-(stickY / div));
}
} }
srv.updateInputs(cpu.getTicks());
} }
// Update inputs in the HID module // Update inputs in the HID module
srv.updateInputs(cpu.getTicks());
SDL_GL_SwapWindow(window); SDL_GL_SwapWindow(window);
} }
} }
@ -307,6 +330,7 @@ void Emulator::run() {
void Emulator::runFrame() { cpu.runFrame(); } void Emulator::runFrame() { cpu.runFrame(); }
bool Emulator::loadROM(const std::filesystem::path& path) { bool Emulator::loadROM(const std::filesystem::path& path) {
stop();
// Get path for saving files (AppData on Windows, /home/user/.local/share/ApplcationName on Linux, etc) // Get path for saving files (AppData on Windows, /home/user/.local/share/ApplcationName on Linux, etc)
// Inside that path, we be use a game-specific folder as well. Eg if we were loading a ROM called PenguinDemo.3ds, the savedata would be in // Inside that path, we be use a game-specific folder as well. Eg if we were loading a ROM called PenguinDemo.3ds, the savedata would be in
// %APPDATA%/Alber/PenguinDemo/SaveData on Windows, and so on. We do this because games save data in their own filesystem on the cart // %APPDATA%/Alber/PenguinDemo/SaveData on Windows, and so on. We do this because games save data in their own filesystem on the cart
@ -346,6 +370,7 @@ bool Emulator::loadROM(const std::filesystem::path& path) {
romType = ROMType::None; romType = ROMType::None;
} }
romLoaded = success;
return success; return success;
} }
@ -390,6 +415,7 @@ bool Emulator::loadELF(std::ifstream& file) {
if (entrypoint.value() & 1) { if (entrypoint.value() & 1) {
Helpers::panic("Misaligned ELF entrypoint. TODO: Check if ELFs can boot in thumb mode"); Helpers::panic("Misaligned ELF entrypoint. TODO: Check if ELFs can boot in thumb mode");
} }
return true; return true;
} }

14
src/main.cpp
View file

@ -5,11 +5,13 @@ int main (int argc, char *argv[]) {
emu.initGraphicsContext(); emu.initGraphicsContext();
auto romPath = std::filesystem::current_path() / (argc > 1 ? argv[1] : "teapot.elf"); if(argc > 1) {
if (!emu.loadROM(romPath)) { auto romPath = std::filesystem::current_path() / argv[1];
// For some reason just .c_str() doesn't show the proper path if (!emu.loadROM(romPath)) {
Helpers::panic("Failed to load ROM file: %s", romPath.string().c_str()); // For some reason just .c_str() doesn't show the proper path
} Helpers::panic("Failed to load ROM file: %s", romPath.string().c_str());
}
}
emu.run(); emu.run();
} }