From 85090ef9c99b047164fd1b3e1455096ec155fbe1 Mon Sep 17 00:00:00 2001 From: Kelly Wilson Date: Tue, 10 Mar 2009 22:02:11 -0600 Subject: [PATCH] Change x64 asm in Cache.d from a positive offset from after rbp "-20(%rbp)+4" to before "4+-20(%rbp)" --- gen/asm-x86-64.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gen/asm-x86-64.h b/gen/asm-x86-64.h index 30e51fdc..edb9449d 100644 --- a/gen/asm-x86-64.h +++ b/gen/asm-x86-64.h @@ -2177,6 +2177,17 @@ namespace AsmParserx8664 } use_star = opTakesLabel();//opInfo->takesLabel(); + + if ( operand->segmentPrefix != Reg_Invalid || operand->constDisplacement ) + { + insnTemplate->printf ( "%d", operand->constDisplacement ); + if ( operand->symbolDisplacement.dim ) + insnTemplate->writebyte ( '+' ); + //addOperand(fmt, Arg_Integer, newIntExp(operand->constDisplacement), asmcode); + if ( opInfo->operands[i] & Opr_Dest ) + asmcode->clobbersMemory = 1; + } + if ( operand->segmentPrefix != Reg_Invalid ) { writeReg ( operand->segmentPrefix ); @@ -2296,15 +2307,6 @@ namespace AsmParserx8664 } if ( use_star ) insnTemplate->writebyte ( '*' ); - if ( operand->segmentPrefix != Reg_Invalid || operand->constDisplacement ) - { - if ( operand->symbolDisplacement.dim ) - insnTemplate->writebyte ( '+' ); - //addOperand(fmt, Arg_Integer, newIntExp(operand->constDisplacement), asmcode); - insnTemplate->printf ( "%d", operand->constDisplacement ); - if ( opInfo->operands[i] & Opr_Dest ) - asmcode->clobbersMemory = 1; - } if ( operand->baseReg != Reg_Invalid || operand->indexReg != Reg_Invalid ) { insnTemplate->writebyte ( '(' );