/[pcsx2_0.9.7]/trunk/pcsx2/IopMem.cpp
ViewVC logotype

Diff of /trunk/pcsx2/IopMem.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 31 by william, Tue Sep 7 03:24:11 2010 UTC revision 62 by william, Tue Sep 7 11:08:22 2010 UTC
# Line 38  void psxMemAlloc() Line 38  void psxMemAlloc()
38                  m_psxAllMem = vtlb_malloc( m_psxMemSize, 4096 );                  m_psxAllMem = vtlb_malloc( m_psxMemSize, 4096 );
39    
40          if( m_psxAllMem == NULL)          if( m_psxAllMem == NULL)
41                  throw Exception::OutOfMemory( "psxMemAlloc > failed allocating memory for the IOP processor." );                  throw Exception::OutOfMemory( L"IOP system ram (and roms)" );
42    
43          u8* curpos = m_psxAllMem;          u8* curpos = m_psxAllMem;
44          psxM = curpos; curpos += Ps2MemSize::IopRam;          psxM = curpos; curpos += Ps2MemSize::IopRam;
# Line 54  void psxMemAlloc() Line 54  void psxMemAlloc()
54  // which is performed by MemInit and PsxMemInit()  // which is performed by MemInit and PsxMemInit()
55  void psxMemReset()  void psxMemReset()
56  {  {
57          jASSUME( psxMemWLUT != NULL );          pxAssume( psxMemWLUT != NULL );
58          jASSUME( m_psxAllMem != NULL );          pxAssume( m_psxAllMem != NULL );
59    
60          DbgCon.WriteLn( "IOP Resetting physical ram..." );          DbgCon.WriteLn( "IOP Resetting physical ram..." );
61    
# Line 87  void psxMemReset() Line 87  void psxMemReset()
87          // Read-only memory areas, so don't map WLUT for these...          // Read-only memory areas, so don't map WLUT for these...
88          for (int i=0; i<0x0040; i++)          for (int i=0; i<0x0040; i++)
89          {          {
90                  psxMemWLUT[i + 0x2000 + 0x1fc0] = (uptr)&PS2MEM_ROM[i << 16];                  psxMemWLUT[i + 0x2000 + 0x1fc0] = (uptr)&eeMem->ROM[i << 16];
91          }          }
92    
93          for (int i=0; i<0x0004; i++)          for (int i=0; i<0x0004; i++)
94          {          {
95                  psxMemWLUT[i + 0x2000 + 0x1e00] = (uptr)&PS2MEM_ROM1[i << 16];                  psxMemWLUT[i + 0x2000 + 0x1e00] = (uptr)&eeMem->ROM1[i << 16];
96          }          }
97    
98          // sif!! (which is read only? (air))          // sif!! (which is read only? (air))
# Line 468  void __fastcall iopMemWrite32(u32 mem, u Line 468  void __fastcall iopMemWrite32(u32 mem, u
468    
469                                  // wtf?  why were we writing to the EE's sif space?  Commenting this out doesn't                                  // wtf?  why were we writing to the EE's sif space?  Commenting this out doesn't
470                                  // break any of my games, and should be more correct, but I guess we'll see.  --air                                  // break any of my games, and should be more correct, but I guess we'll see.  --air
471                                  //*(u32*)(PS2MEM_HW+0xf200+(mem&0xf0)) = value;                                  //*(u32*)(eeHw+0xf200+(mem&0xf0)) = value;
472                                  return;                                  return;
473                          }                          }
474                          else if (t == 0x1000)                          else if (t == 0x1000)

Legend:
Removed from v.31  
changed lines
  Added in v.62

  ViewVC Help
Powered by ViewVC 1.1.22