From fca65ba2ef35517409f15a3dc42acb2c253f3949 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Wed, 15 Apr 2009 17:22:34 +0000 Subject: [PATCH] Add an include so things compile. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@983 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/HwWrite.cpp | 56 ++++++++++++++++----------------- pcsx2/x86/ix86/ix86_inlines.inl | 2 ++ 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/pcsx2/HwWrite.cpp b/pcsx2/HwWrite.cpp index 9c56df9e6d..3739c23619 100644 --- a/pcsx2/HwWrite.cpp +++ b/pcsx2/HwWrite.cpp @@ -403,26 +403,26 @@ __forceinline void hwWrite16(u32 mem, u16 value) psHu16(mem) = value;//dma2 madr HW_LOG("Hardware write DMA2_MADR 32bit at %x with value %x",mem,value); break; - case 0x1000a020: - psHu16(mem) = value;//dma2 qwc - HW_LOG("Hardware write DMA2_QWC 32bit at %x with value %x",mem,value); - break; - case 0x1000a030: - psHu16(mem) = value;//dma2 taddr - HW_LOG("Hardware write DMA2_TADDR 32bit at %x with value %x",mem,value); - break; - case 0x1000a040: - psHu16(mem) = value;//dma2 asr0 - HW_LOG("Hardware write DMA2_ASR0 32bit at %x with value %x",mem,value); - break; - case 0x1000a050: - psHu16(mem) = value;//dma2 asr1 - HW_LOG("Hardware write DMA2_ASR1 32bit at %x with value %x",mem,value); - break; - case 0x1000a080: - psHu16(mem) = value;//dma2 saddr - HW_LOG("Hardware write DMA2_SADDR 32bit at %x with value %x",mem,value); - break; + case 0x1000a020: + psHu16(mem) = value;//dma2 qwc + HW_LOG("Hardware write DMA2_QWC 32bit at %x with value %x",mem,value); + break; + case 0x1000a030: + psHu16(mem) = value;//dma2 taddr + HW_LOG("Hardware write DMA2_TADDR 32bit at %x with value %x",mem,value); + break; + case 0x1000a040: + psHu16(mem) = value;//dma2 asr0 + HW_LOG("Hardware write DMA2_ASR0 32bit at %x with value %x",mem,value); + break; + case 0x1000a050: + psHu16(mem) = value;//dma2 asr1 + HW_LOG("Hardware write DMA2_ASR1 32bit at %x with value %x",mem,value); + break; + case 0x1000a080: + psHu16(mem) = value;//dma2 saddr + HW_LOG("Hardware write DMA2_SADDR 32bit at %x with value %x",mem,value); + break; #endif case 0x1000b000: // dma3 - fromIPU @@ -441,7 +441,7 @@ __forceinline void hwWrite16(u32 mem, u16 value) HW_LOG("Hardware write IPU0DMA_MADR 32bit at %x with value %x",mem,value); break; case 0x1000b020: - psHu16(mem) = value;//dma2 madr + psHu16(mem) = value;//dma2 madr HW_LOG("Hardware write IPU0DMA_QWC 32bit at %x with value %x",mem,value); break; case 0x1000b030: @@ -466,11 +466,11 @@ __forceinline void hwWrite16(u32 mem, u16 value) #ifdef PCSX2_DEVBUILD case 0x1000b410: - psHu16(mem) = value;//dma2 madr + psHu16(mem) = value;//dma2 madr HW_LOG("Hardware write IPU1DMA_MADR 32bit at %x with value %x",mem,value); break; case 0x1000b420: - psHu16(mem) = value;//dma2 madr + psHu16(mem) = value;//dma2 madr HW_LOG("Hardware write IPU1DMA_QWC 32bit at %x with value %x",mem,value); break; case 0x1000b430: @@ -883,11 +883,11 @@ void __fastcall hwWrite32_generic( u32 mem, u32 value ) return; case D2_MADR: regName = "GIFdma MADR"; break; - case D2_QWC: regName = "GIFdma QWC"; break; - case D2_TADR: regName = "GIFdma TADDR"; break; - case D2_ASR0: regName = "GIFdma ASR0"; break; - case D2_ASR1: regName = "GIFdma ASR1"; break; - case D2_SADR: regName = "GIFdma SADDR"; break; + case D2_QWC: regName = "GIFdma QWC"; break; + case D2_TADR: regName = "GIFdma TADDR"; break; + case D2_ASR0: regName = "GIFdma ASR0"; break; + case D2_ASR1: regName = "GIFdma ASR1"; break; + case D2_SADR: regName = "GIFdma SADDR"; break; //------------------------------------------------------------------ case 0x1000c000: // dma5 - sif0 diff --git a/pcsx2/x86/ix86/ix86_inlines.inl b/pcsx2/x86/ix86/ix86_inlines.inl index 3fe2ec54fb..a101a3e386 100644 --- a/pcsx2/x86/ix86/ix86_inlines.inl +++ b/pcsx2/x86/ix86/ix86_inlines.inl @@ -46,6 +46,8 @@ // global optimization fails to resolve the externals and junk. // (score one for MSVC!) +#include "System.h" + namespace x86Emitter { //////////////////////////////////////////////////////////////////////////////////////////