From 15a19c738fa2f5ae0ebaef3d3c134779ca18e4d0 Mon Sep 17 00:00:00 2001
From: Kelly Wilson <wilsonk@cpsc.ucalgary.ca>
Date: Wed, 11 Mar 2009 09:16:41 -0600
Subject: [PATCH] Fix FS:4 miswrite due to earlier changes for a constant
 displacement

---
 gen/asm-x86-64.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gen/asm-x86-64.h b/gen/asm-x86-64.h
index 6c521cc9..48f27909 100644
--- a/gen/asm-x86-64.h
+++ b/gen/asm-x86-64.h
@@ -2181,9 +2181,11 @@ namespace AsmParserx8664
 
                         if ( operand->segmentPrefix != Reg_Invalid || operand->constDisplacement )
                         {
-                            insnTemplate->printf ( "%d", operand->constDisplacement );
                             if ( operand->symbolDisplacement.dim )
+                            {
+                                insnTemplate->printf ( "%d", operand->constDisplacement );
                                 insnTemplate->writebyte ( '+' );
+                            }
                             //addOperand(fmt, Arg_Integer, newIntExp(operand->constDisplacement), asmcode);
                             if ( opInfo->operands[i] & Opr_Dest )
                                 asmcode->clobbersMemory = 1;
@@ -2308,6 +2310,12 @@ namespace AsmParserx8664
                         }
                         if ( use_star )
                             insnTemplate->writebyte ( '*' );
+                        if ( operand->segmentPrefix != Reg_Invalid || !(operand->constDisplacement))
+                        {
+                            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 ( '(' );