From 75d3c053ef8013851c0e9723672b0aa912f29c00 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Mon, 5 Oct 2009 02:25:54 +0000 Subject: [PATCH] Two minor cosmetic fixes from the __aligned switchover. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1960 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/include/x86emitter/x86types.h | 2 +- pcsx2/x86/ix86-32/recVTLB.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/include/x86emitter/x86types.h b/common/include/x86emitter/x86types.h index 9484c5459a..379d34f645 100644 --- a/common/include/x86emitter/x86types.h +++ b/common/include/x86emitter/x86types.h @@ -408,7 +408,7 @@ __forceinline void xWrite( T val ) Displacement += imm; return *this; } -__noinline + __forceinline ModSibStrict operator+( const s32 imm ) const { return ModSibStrict( *this ).Add( imm ); } __forceinline ModSibStrict operator-( const s32 imm ) const { return ModSibStrict( *this ).Add( -imm ); } diff --git a/pcsx2/x86/ix86-32/recVTLB.cpp b/pcsx2/x86/ix86-32/recVTLB.cpp index 9151ab8977..46acd13182 100644 --- a/pcsx2/x86/ix86-32/recVTLB.cpp +++ b/pcsx2/x86/ix86-32/recVTLB.cpp @@ -243,7 +243,7 @@ namespace vtlb_private // If it were smaller than a page we'd end up allowing execution rights on some // other vars additionally (bad!). // -static __aligned(0x1000) u8 m_IndirectDispatchers[0x1000]; +static __pagealigned u8 m_IndirectDispatchers[0x1000]; // ------------------------------------------------------------------------ // mode - 0 for read, 1 for write!