ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #265 from Sonicadvance1/x86_64-vtlb 

Get the VTLB working on x86_64.
This commit is contained in:
Pseudonym 2014-08-22 22:40:45 +01:00
parent e5f7057539 bddb2504b5
commit 3fa5816aab
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/vtlb.cpp
View File

@ -355,7 +355,7 @@ void __fastcall GoemonPreloadTlb()
u32 vaddr = tlb[i].low_add;
u32 paddr = tlb[i].physical_add;
if ((u32)vtlbdata.vmap[vaddr>>VTLB_PAGE_BITS] == 0x80000000u) {
if ((uptr)vtlbdata.vmap[vaddr>>VTLB_PAGE_BITS] == POINTER_SIGN_BIT) {
DevCon.WriteLn("Preload TLB[%d]: From V:0x%8.8x to P:0x%8.8x (%d pages)", i, vaddr, paddr, size >> VTLB_PAGE_BITS);
vtlb_VMap( vaddr , paddr, size);
vtlb_VMap(0x20000000|vaddr , paddr, size);
@ -636,13 +636,13 @@ void vtlb_VMap(u32 vaddr,u32 paddr,u32 size)
while (size > 0)
{
s32 pme;
sptr pme;
if (paddr >= VTLB_PMAP_SZ)
{
pme = UnmappedPhyHandler0;
if (paddr & 0x80000000)
if (paddr & POINTER_SIGN_BIT)
pme = UnmappedPhyHandler1;
pme |= 0x80000000;
pme |= POINTER_SIGN_BIT;
pme |= paddr;// top bit is set anyway ...
}
else

2
pcsx2/vtlb.h
View File

@ -190,6 +190,8 @@ namespace vtlb_private
static const uint VTLB_HANDLER_ITEMS = 128;
static const uptr POINTER_SIGN_BIT = 1ULL << (sizeof(uptr) * 8 - 1);
struct MapData
{
// first indexer -- 8/16/32/64/128 bit tables [values 0-4]