From 2b7ce8688052a9c52b542c3aa82b29385da82e14 Mon Sep 17 00:00:00 2001 From: yabause Date: Sun, 9 Nov 2008 13:37:44 +0000 Subject: [PATCH] Patch by Magliocchetti Riccardo: remove old code that has been replaced and thus commentend more that one year ago. --- desmume/src/armcpu.cpp | 1 - desmume/src/armcpu.h | 18 ------------------ 2 files changed, 19 deletions(-) diff --git a/desmume/src/armcpu.cpp b/desmume/src/armcpu.cpp index 89b319c32..2e9156f7f 100644 --- a/desmume/src/armcpu.cpp +++ b/desmume/src/armcpu.cpp @@ -520,7 +520,6 @@ u32 armcpu_exec() if(ARMPROC.CPSR.bits.T == 0) { -/* if((TEST_COND(CONDITION(armcpu->instruction), armcpu->CPSR)) || ((CONDITION(armcpu->instruction)==0xF)&&(CODE(armcpu->instruction)==0x5)))*/ if((TEST_COND(CONDITION(ARMPROC.instruction), CODE(ARMPROC.instruction), ARMPROC.CPSR))) { if(PROCNUM==0) diff --git a/desmume/src/armcpu.h b/desmume/src/armcpu.h index a07614384..89bec1505 100644 --- a/desmume/src/armcpu.h +++ b/desmume/src/armcpu.h @@ -66,24 +66,6 @@ #define LE 0xD #define AL 0xE -/* -#define TEST_COND(cond, CPSR) (((cond)==AL) ||\ - (((cond)==EQ) && ( CPSR.bits.Z))||\ - (((cond)==NE) && (!CPSR.bits.Z))||\ - (((cond)==CS) && ( CPSR.bits.C))||\ - (((cond)==CC) && (!CPSR.bits.C))||\ - (((cond)==MI) && ( CPSR.bits.N))||\ - (((cond)==PL) && (!CPSR.bits.N))||\ - (((cond)==VS) && ( CPSR.bits.V))||\ - (((cond)==VC) && (!CPSR.bits.V))||\ - (((cond)==HI) && (CPSR.bits.C) && (!CPSR.bits.Z))||\ - (((cond)==LS) && ((CPSR.bits.Z) || (!CPSR.bits.C)))||\ - (((cond)==GE) && (CPSR.bits.N==CPSR.bits.V))||\ - (((cond)==LT) && (CPSR.bits.N!=CPSR.bits.V))||\ - (((cond)==GT) && (CPSR.bits.Z==0) && (CPSR.bits.N==CPSR.bits.V))||\ - (((cond)==LE) && ((CPSR.bits.Z) || (CPSR.bits.N!=CPSR.bits.V)))) -*/ - extern const unsigned char arm_cond_table[16*16]; #define TEST_COND(cond, inst, CPSR) ((arm_cond_table[((CPSR.val >> 24) & 0xf0)+(cond)] >> (inst)) & 1)