diff options
Diffstat (limited to 'src/VBox/Disassembler/DisasmFormatYasm.cpp')
| -rw-r--r-- | src/VBox/Disassembler/DisasmFormatYasm.cpp | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/src/VBox/Disassembler/DisasmFormatYasm.cpp b/src/VBox/Disassembler/DisasmFormatYasm.cpp index 1cdf0fe63..792f55795 100644 --- a/src/VBox/Disassembler/DisasmFormatYasm.cpp +++ b/src/VBox/Disassembler/DisasmFormatYasm.cpp @@ -1,10 +1,10 @@ -/* $Id: DisasmFormatYasm.cpp $ */ +/* $Id: DisasmFormatYasm.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ /** @file * VBox Disassembler - Yasm(/Nasm) Style Formatter. */ /* - * Copyright (C) 2008 Sun Microsystems, Inc. + * Copyright (C) 2008 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -13,10 +13,6 @@ * Foundation, in version 2 as it comes in the "COPYING" file of the * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. */ @@ -731,38 +727,38 @@ DISDECL(size_t) DISFormatYasmEx(PCDISCPUSTATE pCpu, char *pszBuf, size_t cchBuf, if (pParam->flags & (USE_DISPLACEMENT8 | USE_DISPLACEMENT16 | USE_DISPLACEMENT32 | USE_DISPLACEMENT64 | USE_RIPDISPLACEMENT32)) { - int64_t off; + int64_t off2; if (pParam->flags & USE_DISPLACEMENT8) - off = pParam->disp8; + off2 = pParam->disp8; else if (pParam->flags & USE_DISPLACEMENT16) - off = pParam->disp16; + off2 = pParam->disp16; else if (pParam->flags & (USE_DISPLACEMENT32 | USE_RIPDISPLACEMENT32)) - off = pParam->disp32; + off2 = pParam->disp32; else if (pParam->flags & USE_DISPLACEMENT64) - off = pParam->disp64; + off2 = pParam->disp64; else { AssertFailed(); - off = 0; + off2 = 0; } if (fBase || (pParam->flags & USE_INDEX)) { - PUT_C(off >= 0 ? '+' : '-'); - if (off < 0) - off = -off; + PUT_C(off2 >= 0 ? '+' : '-'); + if (off2 < 0) + off2 = -off2; } if (pParam->flags & USE_DISPLACEMENT8) - PUT_NUM_8( off); + PUT_NUM_8( off2); else if (pParam->flags & USE_DISPLACEMENT16) - PUT_NUM_16(off); + PUT_NUM_16(off2); else if (pParam->flags & USE_DISPLACEMENT32) - PUT_NUM_32(off); + PUT_NUM_32(off2); else if (pParam->flags & USE_DISPLACEMENT64) - PUT_NUM_64(off); + PUT_NUM_64(off2); else { - PUT_NUM_32(off); + PUT_NUM_32(off2); PUT_SZ(" wrt rip"); //?? } } |