aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ARMJIT.cpp19
-rw-r--r--src/ARMJIT_A64/ARMJIT_Compiler.cpp9
-rw-r--r--src/ARMJIT_A64/ARMJIT_LoadStore.cpp41
-rw-r--r--src/ARMJIT_Memory.cpp19
-rw-r--r--src/ARMJIT_x64/ARMJIT_Branch.cpp2
-rw-r--r--src/frontend/qt_sdl/ArchiveUtil.cpp109
-rw-r--r--src/frontend/qt_sdl/ArchiveUtil.h25
-rw-r--r--src/frontend/qt_sdl/CMakeLists.txt19
-rw-r--r--src/frontend/qt_sdl/main.cpp71
-rw-r--r--src/frontend/qt_sdl/main.h2
10 files changed, 271 insertions, 45 deletions
diff --git a/src/ARMJIT.cpp b/src/ARMJIT.cpp
index 1921f13..bece539 100644
--- a/src/ARMJIT.cpp
+++ b/src/ARMJIT.cpp
@@ -604,6 +604,8 @@ void CompileBlock(ARM* cpu)
// they are going to be hashed
u32 literalValues[Config::JIT_MaxBlockSize];
u32 instrValues[Config::JIT_MaxBlockSize];
+ // due to instruction merging i might not reflect the amount of actual instructions
+ u32 numInstrs = 0;
cpu->FillPipeline();
u32 nextInstr[2] = {cpu->NextInstr[0], cpu->NextInstr[1]};
@@ -623,13 +625,13 @@ void CompileBlock(ARM* cpu)
instrs[i].SetFlags = 0;
instrs[i].Instr = nextInstr[0];
nextInstr[0] = nextInstr[1];
-
+
instrs[i].Addr = nextInstrAddr[0];
nextInstrAddr[0] = nextInstrAddr[1];
nextInstrAddr[1] = r15;
JIT_DEBUGPRINT("instr %08x %x\n", instrs[i].Instr & (thumb ? 0xFFFF : ~0), instrs[i].Addr);
- instrValues[i] = instrs[i].Instr;
+ instrValues[numInstrs++] = instrs[i].Instr;
u32 translatedAddr = LocaliseCodeAddress(cpu->Num, instrs[i].Addr);
assert(translatedAddr >> 27);
@@ -741,12 +743,13 @@ void CompileBlock(ARM* cpu)
if (thumb && instrs[i].Info.Kind == ARMInstrInfo::tk_BL_LONG_2 && i > 0
&& instrs[i - 1].Info.Kind == ARMInstrInfo::tk_BL_LONG_1)
{
- instrs[i - 1].Info.Kind = ARMInstrInfo::tk_BL_LONG;
- instrs[i - 1].Instr = (instrs[i - 1].Instr & 0xFFFF) | (instrs[i].Instr << 16);
- instrs[i - 1].Info.DstRegs = 0xC000;
- instrs[i - 1].Info.SrcRegs = 0;
- instrs[i - 1].Info.EndBlock = true;
i--;
+ instrs[i].Info.Kind = ARMInstrInfo::tk_BL_LONG;
+ instrs[i].Instr = (instrs[i].Instr & 0xFFFF) | (instrs[i + 1].Instr << 16);
+ instrs[i].Info.DstRegs = 0xC000;
+ instrs[i].Info.SrcRegs = 0;
+ instrs[i].Info.EndBlock = true;
+ JIT_DEBUGPRINT("merged BL\n");
}
if (instrs[i].Info.Branches() && Config::JIT_BranchOptimisations)
@@ -829,7 +832,7 @@ void CompileBlock(ARM* cpu)
} while(!instrs[i - 1].Info.EndBlock && i < Config::JIT_MaxBlockSize && !cpu->Halted && (!cpu->IRQ || (cpu->CPSR & 0x80)));
u32 literalHash = (u32)XXH3_64bits(literalValues, numLiterals * 4);
- u32 instrHash = (u32)XXH3_64bits(instrValues, i * 4);
+ u32 instrHash = (u32)XXH3_64bits(instrValues, numInstrs * 4);
auto prevBlockIt = RestoreCandidates.find(instrHash);
JitBlock* prevBlock = NULL;
diff --git a/src/ARMJIT_A64/ARMJIT_Compiler.cpp b/src/ARMJIT_A64/ARMJIT_Compiler.cpp
index 5fe3fe7..880a6fc 100644
--- a/src/ARMJIT_A64/ARMJIT_Compiler.cpp
+++ b/src/ARMJIT_A64/ARMJIT_Compiler.cpp
@@ -187,7 +187,8 @@ Compiler::Compiler()
JitRWBase = aligned_alloc(0x1000, JitMemSize);
JitRXStart = (u8*)&__start__ - JitMemSize - 0x1000;
- JitRWStart = virtmemReserve(JitMemSize);
+ virtmemLock();
+ JitRWStart = virtmemFindAslr(JitMemSize, 0x1000);
MemoryInfo info = {0};
u32 pageInfo = {0};
int i = 0;
@@ -214,6 +215,8 @@ Compiler::Compiler()
succeded = R_SUCCEEDED(svcMapProcessMemory(JitRWStart, envGetOwnProcessHandle(), (u64)JitRXStart, JitMemSize));
assert(succeded);
+ virtmemUnlock();
+
SetCodeBase((u8*)JitRWStart, (u8*)JitRXStart);
JitMemMainSize = JitMemSize;
#else
@@ -426,7 +429,6 @@ Compiler::~Compiler()
{
bool succeded = R_SUCCEEDED(svcUnmapProcessMemory(JitRWStart, envGetOwnProcessHandle(), (u64)JitRXStart, JitMemSize));
assert(succeded);
- virtmemFree(JitRWStart, JitMemSize);
succeded = R_SUCCEEDED(svcUnmapProcessCodeMemory(envGetOwnProcessHandle(), (u64)JitRXStart, (u64)JitRWBase, JitMemSize));
assert(succeded);
free(JitRWBase);
@@ -753,7 +755,8 @@ JitBlockEntry Compiler::CompileBlock(ARM* cpu, bool thumb, FetchedInstr instrs[]
FixupBranch skipNop = B();
SetJumpTarget(skipExecute);
- Comp_AddCycles_C();
+ if (IrregularCycles)
+ Comp_AddCycles_C(true);
Comp_BranchSpecialBehaviour(false);
diff --git a/src/ARMJIT_A64/ARMJIT_LoadStore.cpp b/src/ARMJIT_A64/ARMJIT_LoadStore.cpp
index 2c14dc6..3d30759 100644
--- a/src/ARMJIT_A64/ARMJIT_LoadStore.cpp
+++ b/src/ARMJIT_A64/ARMJIT_LoadStore.cpp
@@ -472,31 +472,24 @@ s32 Compiler::Comp_MemAccessBlock(int rn, BitSet16 regs, bool store, bool preinc
bool compileFastPath = Config::JIT_FastMemory
&& store && !usermode && (CurInstr.Cond() < 0xE || ARMJIT_Memory::IsFastmemCompatible(expectedTarget));
- if (decrement)
{
- s32 offset = -regsCount * 4 + (preinc ? 0 : 4);
+ s32 offset = decrement
+ ? -regsCount * 4 + (preinc ? 0 : 4)
+ : (preinc ? 4 : 0);
+
if (offset)
- {
ADDI2R(W0, MapReg(rn), offset);
- ANDI2R(W0, W0, ~3);
- }
- else
- {
+ else if (compileFastPath)
ANDI2R(W0, MapReg(rn), ~3);
- }
- }
- else
- {
- ANDI2R(W0, MapReg(rn), ~3);
- if (preinc)
- ADD(W0, W0, 4);
+ else
+ MOV(W0, MapReg(rn));
}
u8* patchFunc;
if (compileFastPath)
{
ptrdiff_t fastPathStart = GetCodeOffset();
- ptrdiff_t loadStoreOffsets[16];
+ ptrdiff_t loadStoreOffsets[8];
MOVP2R(X1, Num == 0 ? ARMJIT_Memory::FastMem9Start : ARMJIT_Memory::FastMem7Start);
ADD(X1, X1, X0);
@@ -547,16 +540,19 @@ s32 Compiler::Comp_MemAccessBlock(int rn, BitSet16 regs, bool store, bool preinc
LoadReg(nextReg, second);
loadStoreOffsets[i++] = GetCodeOffset();
-
if (store)
+ {
STP(INDEX_SIGNED, first, second, X1, offset);
+ }
else
+ {
LDP(INDEX_SIGNED, first, second, X1, offset);
-
- if (!(RegCache.LoadedRegs & (1 << reg)) && !store)
- SaveReg(reg, first);
- if (!(RegCache.LoadedRegs & (1 << nextReg)) && !store)
- SaveReg(nextReg, second);
+
+ if (!(RegCache.LoadedRegs & (1 << reg)))
+ SaveReg(reg, first);
+ if (!(RegCache.LoadedRegs & (1 << nextReg)))
+ SaveReg(nextReg, second);
+ }
offset += 8;
}
@@ -566,7 +562,8 @@ s32 Compiler::Comp_MemAccessBlock(int rn, BitSet16 regs, bool store, bool preinc
SwapCodeRegion();
patchFunc = (u8*)GetRXPtr();
patch.PatchFunc = patchFunc;
- for (i = 0; i < regsCount; i++)
+ u32 numLoadStores = i;
+ for (i = 0; i < numLoadStores; i++)
{
patch.PatchOffset = fastPathStart - loadStoreOffsets[i];
LoadStorePatches[loadStoreOffsets[i]] = patch;
diff --git a/src/ARMJIT_Memory.cpp b/src/ARMJIT_Memory.cpp
index 33d6bcf..5539880 100644
--- a/src/ARMJIT_Memory.cpp
+++ b/src/ARMJIT_Memory.cpp
@@ -275,6 +275,7 @@ u8 MappingStatus9[1 << (32-12)];
u8 MappingStatus7[1 << (32-12)];
#if defined(__SWITCH__)
+VirtmemReservation* FastMem9Reservation, *FastMem7Reservation;
u8* MemoryBase;
u8* MemoryBaseCodeMem;
#elif defined(_WIN32)
@@ -676,7 +677,8 @@ void Init()
{
#if defined(__SWITCH__)
MemoryBase = (u8*)aligned_alloc(0x1000, MemoryTotalSize);
- MemoryBaseCodeMem = (u8*)virtmemReserve(MemoryTotalSize);
+ virtmemLock();
+ MemoryBaseCodeMem = (u8*)virtmemFindCodeMemory(MemoryTotalSize, 0x1000);
bool succeded = R_SUCCEEDED(svcMapProcessCodeMemory(envGetOwnProcessHandle(), (u64)MemoryBaseCodeMem,
(u64)MemoryBase, MemoryTotalSize));
@@ -686,11 +688,15 @@ void Init()
assert(succeded);
// 8 GB of address space, just don't ask...
- FastMem9Start = virtmemReserve(AddrSpaceSize);
+ FastMem9Start = virtmemFindAslr(AddrSpaceSize, 0x1000);
assert(FastMem9Start);
- FastMem7Start = virtmemReserve(AddrSpaceSize);
+ FastMem7Start = virtmemFindAslr(AddrSpaceSize, 0x1000);
assert(FastMem7Start);
+ FastMem9Reservation = virtmemAddReservation(FastMem9Start, AddrSpaceSize);
+ FastMem7Reservation = virtmemAddReservation(FastMem7Start, AddrSpaceSize);
+ virtmemUnlock();
+
u8* basePtr = MemoryBaseCodeMem;
#elif defined(_WIN32)
ExceptionHandlerHandle = AddVectoredExceptionHandler(1, ExceptionHandler);
@@ -775,11 +781,12 @@ void Init()
void DeInit()
{
#if defined(__SWITCH__)
- virtmemFree(FastMem9Start, AddrSpaceSize);
- virtmemFree(FastMem7Start, AddrSpaceSize);
+ virtmemLock();
+ virtmemRemoveReservation(FastMem9Reservation);
+ virtmemRemoveReservation(FastMem7Reservation);
+ virtmemUnlock();
svcUnmapProcessCodeMemory(envGetOwnProcessHandle(), (u64)MemoryBaseCodeMem, (u64)MemoryBase, MemoryTotalSize);
- virtmemFree(MemoryBaseCodeMem, MemoryTotalSize);
free(MemoryBase);
#elif defined(__APPLE__)
char* fastmemPidName = new char[snprintf(NULL, 0, "melondsfastmem%d", getpid()) + 1];
diff --git a/src/ARMJIT_x64/ARMJIT_Branch.cpp b/src/ARMJIT_x64/ARMJIT_Branch.cpp
index 70ec781..f73f64e 100644
--- a/src/ARMJIT_x64/ARMJIT_Branch.cpp
+++ b/src/ARMJIT_x64/ARMJIT_Branch.cpp
@@ -275,7 +275,7 @@ void Compiler::T_Comp_BL_Merged()
target |= 1;
MOV(32, MapReg(14), Imm32((R15 - 2) | 1));
-
+
Comp_JumpTo(target);
}
diff --git a/src/frontend/qt_sdl/ArchiveUtil.cpp b/src/frontend/qt_sdl/ArchiveUtil.cpp
new file mode 100644
index 0000000..ba6e4b6
--- /dev/null
+++ b/src/frontend/qt_sdl/ArchiveUtil.cpp
@@ -0,0 +1,109 @@
+/*
+ Copyright 2016-2020 Arisotura, WaluigiWare64
+
+ This file is part of melonDS.
+
+ melonDS is free software: you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free
+ Software Foundation, either version 3 of the License, or (at your option)
+ any later version.
+
+ melonDS is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with melonDS. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include "ArchiveUtil.h"
+
+#ifdef _WIN32
+ #include <direct.h>
+ #define mkdir(dir, mode) _mkdir(dir)
+#endif
+
+namespace Archive
+{
+
+QVector<QString> ListArchive(const char* path)
+{
+ struct archive *a;
+ struct archive_entry *entry;
+ int r;
+
+ QVector<QString> fileList = {"OK"};
+
+ a = archive_read_new();
+ archive_read_support_filter_all(a);
+ archive_read_support_format_all(a);
+ r = archive_read_open_filename(a, path, 10240);
+ if (r != ARCHIVE_OK)
+ {
+ return QVector<QString> {"Err"};
+ }
+
+ while (archive_read_next_header(a, &entry) == ARCHIVE_OK)
+ {
+ fileList.push_back(archive_entry_pathname(entry));
+ archive_read_data_skip(a);
+ }
+ archive_read_close(a);
+ archive_read_free(a);
+ if (r != ARCHIVE_OK)
+ {
+ return QVector<QString> {"Err"};
+ }
+
+ return fileList;
+}
+
+QVector<QString> ExtractFileFromArchive(const char* path, const char* wantedFile)
+{
+ struct archive *a = archive_read_new();
+ struct archive_entry *entry;
+ int r;
+
+ archive_read_support_format_all(a);
+ archive_read_support_filter_all(a);
+
+ r = archive_read_open_filename(a, path, 10240);
+ if (r != ARCHIVE_OK)
+ {
+ return QVector<QString> {"Err"};
+ }
+ while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
+ if (wantedFile == nullptr)
+ {
+ break;
+ }
+ if (strcmp(wantedFile, archive_entry_pathname(entry)) == 0)
+ {
+ break;
+ }
+ }
+ size_t bytesToWrite = archive_entry_size(entry);
+ auto archiveBuffer = std::make_unique<u8[]>(bytesToWrite);
+ ssize_t bytesRead = archive_read_data(a, archiveBuffer.get(), bytesToWrite);
+ if (bytesRead < 0)
+ {
+ printf(archive_error_string(a));
+ archiveBuffer.reset(nullptr);
+ return QVector<QString> {"Err", archive_error_string(a)};
+ }
+ QString nameToWrite = QFileInfo(path).absolutePath() + "/" + QFileInfo(path).baseName() + "/" + archive_entry_pathname(entry);
+
+ mkdir(QFileInfo(path).baseName().toUtf8().constData(), 600); // Create directory otherwise fopen will not open the file
+ FILE* fileToWrite = fopen(nameToWrite.toUtf8().constData(), "wb");
+ fwrite((char*)archiveBuffer.get(), bytesToWrite, 1, fileToWrite);
+ fclose(fileToWrite);
+
+ archiveBuffer.reset(nullptr);
+ archive_read_close(a);
+ archive_read_free(a);
+ return QVector<QString> {nameToWrite};
+
+}
+
+
+}
diff --git a/src/frontend/qt_sdl/ArchiveUtil.h b/src/frontend/qt_sdl/ArchiveUtil.h
new file mode 100644
index 0000000..a6f404a
--- /dev/null
+++ b/src/frontend/qt_sdl/ArchiveUtil.h
@@ -0,0 +1,25 @@
+#ifndef ARCHIVEUTIL_H
+#define ARCHIVEUTIL_H
+
+#include <stdio.h>
+
+#include <string>
+#include <memory>
+
+#include <QVector>
+#include <QDir>
+
+#include <archive.h>
+#include <archive_entry.h>
+
+#include "types.h"
+
+namespace Archive
+{
+
+QVector<QString> ListArchive(const char* path);
+QVector<QString> ExtractFileFromArchive(const char* path, const char* wantedFile);
+
+}
+
+#endif // ARCHIVEUTIL_H
diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt
index 0d695d6..f0362e5 100644
--- a/src/frontend/qt_sdl/CMakeLists.txt
+++ b/src/frontend/qt_sdl/CMakeLists.txt
@@ -17,6 +17,9 @@ SET(SOURCES_QT_SDL
font.h
Platform.cpp
PlatformConfig.cpp
+
+ ArchiveUtil.h
+ ArchiveUtil.cpp
../Util_ROM.cpp
../Util_Video.cpp
@@ -51,6 +54,15 @@ find_package(Iconv REQUIRED)
pkg_check_modules(SDL2 REQUIRED sdl2)
pkg_check_modules(SLIRP REQUIRED slirp)
+if (APPLE)
+ # Find libarchive on macOS, because macOS only provides the library, not the headers
+ execute_process(COMMAND brew --prefix libarchive
+ OUTPUT_VARIABLE LIBARCHIVE_DIR
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ list(APPEND CMAKE_PREFIX_PATH "${LIBARCHIVE_DIR}")
+endif()
+pkg_check_modules(LIBARCHIVE REQUIRED libarchive)
+
if (WIN32 AND (CMAKE_BUILD_TYPE STREQUAL Release))
add_executable(melonDS WIN32 ${SOURCES_QT_SDL})
else()
@@ -61,15 +73,16 @@ target_link_libraries(melonDS ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS})
target_include_directories(melonDS PRIVATE ${SLIRP_INCLUDE_DIRS})
+target_include_directories(melonDS PRIVATE ${LIBARCHIVE_INCLUDE_DIRS})
target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../..")
target_link_libraries(melonDS core)
if (BUILD_STATIC)
- target_link_libraries(melonDS -static ${SDL2_STATIC_LIBRARIES} ${SLIRP_STATIC_LIBRARIES})
+ target_link_libraries(melonDS -static ${SDL2_STATIC_LIBRARIES} ${SLIRP_STATIC_LIBRARIES} ${LIBARCHIVE_STATIC_LIBRARIES})
else()
- target_link_libraries(melonDS ${SDL2_LIBRARIES} ${SLIRP_LIBRARIES})
+ target_link_libraries(melonDS ${SDL2_LIBRARIES} ${SLIRP_LIBRARIES} ${LIBARCHIVE_LIBRARIES})
endif()
if (NOT Iconv_IS_BUILT_IN)
@@ -85,7 +98,7 @@ elseif (WIN32)
target_link_libraries(melonDS comctl32 d2d1 dwrite uxtheme ws2_32 iphlpapi gdi32)
if (BUILD_STATIC)
- target_link_libraries(melonDS imm32 winmm version setupapi -static Qt5::Core Qt5::Gui Qt5::Widgets z zstd)
+ target_link_libraries(melonDS imm32 winmm version setupapi -static Qt5::Core Qt5::Gui Qt5::Widgets zstd)
else()
target_link_libraries(melonDS Qt5::Core Qt5::Gui Qt5::Widgets)
endif()
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 33db28f..d30a6db 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -21,14 +21,20 @@
#include <stdio.h>
#include <string.h>
+#include <vector>
+#include <string>
+#include <algorithm>
+
#include <QApplication>
#include <QMessageBox>
#include <QMenuBar>
#include <QFileDialog>
+#include <QInputDialog>
#include <QPaintEvent>
#include <QPainter>
#include <QKeyEvent>
#include <QMimeData>
+#include <QVector>
#include <SDL2/SDL.h>
@@ -63,6 +69,7 @@
#include "main_shaders.h"
+#include "ArchiveUtil.h"
// TODO: uniform variable spelling
@@ -1020,6 +1027,9 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
actOpenROM = menu->addAction("Open ROM...");
connect(actOpenROM, &QAction::triggered, this, &MainWindow::onOpenFile);
+
+ actOpenROMArchive = menu->addAction("Open ROM inside Archive...");
+ connect(actOpenROMArchive, &QAction::triggered, this, &MainWindow::onOpenFileArchive);
recentMenu = menu->addMenu("Open Recent");
for(int i = 0; i < 10; ++i)
@@ -1462,7 +1472,7 @@ void MainWindow::loadROM(QString filename)
recentFileList.removeAll(filename);
recentFileList.prepend(filename);
updateRecentFilesMenu();
-
+
// TODO: validate the input file!!
// * check that it is a proper ROM
// * ensure the binary offsets are sane
@@ -1515,13 +1525,70 @@ void MainWindow::onOpenFile()
QString filename = QFileDialog::getOpenFileName(this,
"Open ROM",
Config::LastROMFolder,
- "DS ROMs (*.nds *.dsi *.srl);;GBA ROMs (*.gba);;Any file (*.*)");
+ "DS ROMs (*.nds *.dsi *.srl);;GBA ROMs (*.gba *.zip);;Any file (*.*)");
+ if (filename.isEmpty())
+ {
+ emuThread->emuUnpause();
+ return;
+ }
+
+ loadROM(filename);
+}
+
+void MainWindow::onOpenFileArchive()
+{
+ emuThread->emuPause();
+
+ QString filename = QFileDialog::getOpenFileName(this,
+ "Open ROM Archive",
+ Config::LastROMFolder,
+ "Archived ROMs (*.zip *.7z *.rar *.tar *.tar.gz *.tar.xz *.tar.bz2);;Any file (*.*)");
if (filename.isEmpty())
{
emuThread->emuUnpause();
return;
}
+ printf("Finding list of ROMs...\n");
+ QVector<QString> archiveROMList = Archive::ListArchive(filename.toUtf8().constData());
+ if (archiveROMList.size() > 2)
+ {
+ archiveROMList.removeFirst();
+ QString toLoad = QInputDialog::getItem(this, "melonDS",
+ "The archive was found to have multiple files. Select which ROM you want to load.", archiveROMList.toList(), 0, false);
+ printf("Extracting '%s'\n", toLoad.toUtf8().constData());
+ QVector<QString> extractResult = Archive::ExtractFileFromArchive(filename.toUtf8().constData(), toLoad.toUtf8().constData());
+ if (extractResult[0] != QString("Err"))
+ {
+ filename = extractResult[0];
+ }
+ else
+ {
+ QMessageBox::critical(this, "melonDS", QString("There was an error while trying to extract the ROM from the archive: ") + extractResult[1]);
+ }
+ }
+ else if (archiveROMList.size() == 2)
+ {
+ printf("Extracting the only ROM in archive\n");
+ QVector<QString> extractResult = Archive::ExtractFileFromArchive(filename.toUtf8().constData(), nullptr);
+ if (extractResult[0] != QString("Err"))
+ {
+ filename = extractResult[0];
+ }
+ else
+ {
+ QMessageBox::critical(this, "melonDS", QString("There was an error while trying to extract the ROM from the archive: ") + extractResult[1]);
+ }
+ }
+ else if ((archiveROMList.size() == 1) && (archiveROMList[0] == QString("OK")))
+ {
+ QMessageBox::warning(this, "melonDS", "The archive is intact, but there are no files inside.");
+ }
+ else
+ {
+ QMessageBox::critical(this, "melonDS", "The archive could not be read. It may be corrupt or you don't have the permissions.");
+ }
+
loadROM(filename);
}
diff --git a/src/frontend/qt_sdl/main.h b/src/frontend/qt_sdl/main.h
index d31e706..97f514b 100644
--- a/src/frontend/qt_sdl/main.h
+++ b/src/frontend/qt_sdl/main.h
@@ -191,6 +191,7 @@ signals:
private slots:
void onOpenFile();
+ void onOpenFileArchive();
void onClickRecentFile();
void onClearRecentFiles();
void onBootFirmware();
@@ -251,6 +252,7 @@ public:
QWidget* panel;
QAction* actOpenROM;
+ QAction* actOpenROMArchive;
QAction* actBootFirmware;
QAction* actSaveState[9];
QAction* actLoadState[9];