/[pcsx2_0.9.7]/trunk/pcsx2/x86/BaseblockEx.h
ViewVC logotype

Diff of /trunk/pcsx2/x86/BaseblockEx.h

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

revision 62 by william, Tue Sep 7 11:08:22 2010 UTC revision 280 by william, Thu Dec 23 12:02:12 2010 UTC
# Line 81  public: Line 81  public:
81          __fi int Index (u32 startpc) const          __fi int Index (u32 startpc) const
82          {          {
83                  int idx = LastIndex(startpc);                  int idx = LastIndex(startpc);
                 // fixme: I changed the parenthesis to be unambiguous, but this needs to be checked to see if ((x or y or z) and w)  
                 // is correct, or ((x or y) or (z and w)), or some other variation. --arcum42  
                 // Mixing &&'s and ||'s is not actually ambiguous; &&'s take precedence.  Reverted to old behavior -- ChickenLiver.  
84                  if ((idx == -1) || (startpc < blocks[idx].startpc) ||                  if ((idx == -1) || (startpc < blocks[idx].startpc) ||
85                          ((blocks[idx].size) && (startpc >= blocks[idx].startpc + blocks[idx].size * 4)))                          ((blocks[idx].size) && (startpc >= blocks[idx].startpc + blocks[idx].size * 4)))
86                          return -1;                          return -1;
# Line 139  public: Line 136  public:
136  static void recLUT_SetPage(uptr reclut[0x10000], uptr hwlut[0x10000],  static void recLUT_SetPage(uptr reclut[0x10000], uptr hwlut[0x10000],
137                                                     BASEBLOCK *mapbase, uint pagebase, uint pageidx, uint mappage)                                                     BASEBLOCK *mapbase, uint pagebase, uint pageidx, uint mappage)
138  {  {
139            // this value is in 64k pages!
140          uint page = pagebase + pageidx;          uint page = pagebase + pageidx;
141    
142          jASSUME( page < 0x10000 );          pxAssume( page < 0x10000 );
143          reclut[page] = (uptr)&mapbase[(mappage - page) << 14];          reclut[page] = (uptr)&mapbase[(mappage - page) << 14];
144          if (hwlut)          if (hwlut)
145                  hwlut[page] = 0u - (pagebase << 16);                  hwlut[page] = 0u - (pagebase << 16);

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

  ViewVC Help
Powered by ViewVC 1.1.22