/[pcsx2_0.9.7]/trunk/common/include/x86emitter/inlines.inl
ViewVC logotype

Diff of /trunk/common/include/x86emitter/inlines.inl

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

revision 61 by william, Tue Sep 7 03:24:11 2010 UTC revision 62 by william, Tue Sep 7 11:08:22 2010 UTC
# Line 37  Line 37 
37  // definitions in the .h file because of inter-dependencies with other classes.  // definitions in the .h file because of inter-dependencies with other classes.
38  //   (score one for C++!!)  //   (score one for C++!!)
39  //  //
40  // In order for MSVC to work correctly with __forceinline on class members,  // In order for MSVC to work correctly with __fi on class members,
41  // however, we need to include these methods into all source files which might  // however, we need to include these methods into all source files which might
42  // reference them.  Without this MSVC generates linker errors.  Or, in other words,  // reference them.  Without this MSVC generates linker errors.  Or, in other words,
43  // global optimization fails to resolve the externals and junk.  // global optimization fails to resolve the externals and junk.
# Line 45  Line 45 
45    
46  namespace x86Emitter  namespace x86Emitter
47  {  {
48    #if 0
49          // --------------------------------------------------------------------------------------          // --------------------------------------------------------------------------------------
50          //  x86Register Method Implementations (inlined!)          //  x86Register Method Implementations (inlined!)
51          // --------------------------------------------------------------------------------------          // --------------------------------------------------------------------------------------
52    
53          __forceinline xAddressInfo xAddressReg::operator+( const xAddressReg& right ) const          __fi xAddressInfo xAddressReg::operator+( const xAddressReg& right ) const
54          {          {
55                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );
56                  return xAddressInfo( *this, right );                  return xAddressInfo( *this, right );
57          }          }
58    
59          __forceinline xAddressInfo xAddressReg::operator+( const xAddressInfo& right ) const          __fi xAddressInfo xAddressReg::operator+( const xAddressInfo& right ) const
60          {          {
61                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );
62                  return right + *this;                  return right + *this;
63          }          }
64    
65          __forceinline xAddressInfo xAddressReg::operator+( s32 right ) const          __fi xAddressInfo xAddressReg::operator+( s32 right ) const
66          {          {
67                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );
68                  return xAddressInfo( *this, right );                  return xAddressInfo( *this, right );
69          }          }
70    
71          __forceinline xAddressInfo xAddressReg::operator+( const void* right ) const          __fi xAddressInfo xAddressReg::operator+( const void* right ) const
72          {          {
73                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );
74                  return xAddressInfo( *this, (s32)right );                  return xAddressInfo( *this, (s32)right );
75          }          }
76    
77          // ------------------------------------------------------------------------          // ------------------------------------------------------------------------
78          __forceinline xAddressInfo xAddressReg::operator-( s32 right ) const          __fi xAddressInfo xAddressReg::operator-( s32 right ) const
79          {          {
80                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );
81                  return xAddressInfo( *this, -right );                  return xAddressInfo( *this, -right );
82          }          }
83    
84          __forceinline xAddressInfo xAddressReg::operator-( const void* right ) const          __fi xAddressInfo xAddressReg::operator-( const void* right ) const
85          {          {
86                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );
87                  return xAddressInfo( *this, -(s32)right );                  return xAddressInfo( *this, -(s32)right );
88          }          }
89    
90          // ------------------------------------------------------------------------          // ------------------------------------------------------------------------
91          __forceinline xAddressInfo xAddressReg::operator*( u32 right ) const          __fi xAddressInfo xAddressReg::operator*( u32 right ) const
92          {          {
93                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );
94                  return xAddressInfo( xEmptyReg, *this, right );                  return xAddressInfo( xEmptyReg, *this, right );
95          }          }
96    
97          __forceinline xAddressInfo xAddressReg::operator<<( u32 shift ) const          __fi xAddressInfo xAddressReg::operator<<( u32 shift ) const
98          {          {
99                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );                  pxAssertMsg( Id != -1, "Uninitialized x86 register." );
100                  return xAddressInfo( xEmptyReg, *this, 1<<shift );                  return xAddressInfo( xEmptyReg, *this, 1<<shift );
101          }          }
102            #endif
103  }  }

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

  ViewVC Help
Powered by ViewVC 1.1.22