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/GPU3D.cpp20
-rw-r--r--src/frontend/qt_sdl/main.cpp5
7 files changed, 63 insertions, 52 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/GPU3D.cpp b/src/GPU3D.cpp
index 53fafb3..e199d9a 100644
--- a/src/GPU3D.cpp
+++ b/src/GPU3D.cpp
@@ -1699,15 +1699,15 @@ void PosTest()
AddCycles(5);
}
-void VecTest(u32* params)
+void VecTest(u32 param)
{
// TODO: maybe it overwrites the normal registers, too
s16 normal[3];
- normal[0] = (s16)((params[0] & 0x000003FF) << 6) >> 6;
- normal[1] = (s16)((params[0] & 0x000FFC00) >> 4) >> 6;
- normal[2] = (s16)((params[0] & 0x3FF00000) >> 14) >> 6;
+ normal[0] = (s16)((param & 0x000003FF) << 6) >> 6;
+ normal[1] = (s16)((param & 0x000FFC00) >> 4) >> 6;
+ normal[2] = (s16)((param & 0x3FF00000) >> 14) >> 6;
VecTestResult[0] = (normal[0]*VecMatrix[0] + normal[1]*VecMatrix[4] + normal[2]*VecMatrix[8]) >> 9;
VecTestResult[1] = (normal[0]*VecMatrix[1] + normal[1]*VecMatrix[5] + normal[2]*VecMatrix[9]) >> 9;
@@ -2170,6 +2170,12 @@ void ExecuteCommand()
Viewport[5] = (Viewport[1] - Viewport[3] + 1) & 0xFF; // height
break;
+ case 0x72: // vec test
+ VertexPipelineCmdDelayed6();
+ NumTestCommands--;
+ VecTest(entry.Param);
+ break;
+
default:
VertexPipelineCmdDelayed4();
//printf("!! UNKNOWN GX COMMAND %02X %08X\n", entry.Command, entry.Param);
@@ -2193,7 +2199,6 @@ void ExecuteCommand()
VertexPipelineCmdDelayed8();
break;
case 0x70: StallPolygonPipeline(10 + 1, 0); break;
- case 0x72: VertexPipelineCmdDelayed6(); break;
default: VertexPipelineCmdDelayed4(); break;
}
}
@@ -2408,11 +2413,6 @@ void ExecuteCommand()
BoxTest(ExecParams);
break;
- case 0x72: // vec test
- NumTestCommands--;
- VecTest(ExecParams);
- break;
-
default:
__builtin_unreachable();
}
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 1015800..d30a6db 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -2058,12 +2058,13 @@ void MainWindow::onFullscreenToggled()
if (!mainWindow->isFullScreen())
{
mainWindow->showFullScreen();
- mainWindow->menuBar()->hide();
+ mainWindow->menuBar()->setFixedHeight(0); // Don't use hide() as menubar actions stop working
}
else
{
mainWindow->showNormal();
- mainWindow->menuBar()->show();
+ int menuBarHeight = mainWindow->menuBar()->sizeHint().height();
+ mainWindow->menuBar()->setFixedHeight(menuBarHeight);
}
}