| Index: third_party/yasm/patched-yasm/modules/arch/x86/x86expr.c
|
| ===================================================================
|
| --- third_party/yasm/patched-yasm/modules/arch/x86/x86expr.c (revision 71129)
|
| +++ third_party/yasm/patched-yasm/modules/arch/x86/x86expr.c (working copy)
|
| @@ -25,7 +25,7 @@
|
| * POSSIBILITY OF SUCH DAMAGE.
|
| */
|
| #include <util.h>
|
| -/*@unused@*/ RCSID("$Id: x86expr.c 2162 2008-12-21 10:57:36Z peter $");
|
| +/*@unused@*/ RCSID("$Id: x86expr.c 2199 2009-05-10 05:24:46Z peter $");
|
|
|
| #include <libyasm.h>
|
|
|
| @@ -572,7 +572,6 @@
|
| yasm_bytecode *bc)
|
| {
|
| int retval;
|
| - unsigned char *drex = x86_ea->need_drex ? &x86_ea->drex : NULL;
|
|
|
| if (*addrsize == 0) {
|
| /* we need to figure out the address size from what we know about:
|
| @@ -823,7 +822,7 @@
|
| * of register basereg is, as x86_set_rex_from_reg doesn't pay
|
| * much attention.
|
| */
|
| - if (yasm_x86__set_rex_from_reg(rex, drex, &low3,
|
| + if (yasm_x86__set_rex_from_reg(rex, &low3,
|
| (unsigned int)(X86_REG64 | basereg),
|
| bits, X86_REX_B))
|
| return 1;
|
| @@ -850,7 +849,7 @@
|
| if (basereg == REG3264_NONE)
|
| x86_ea->sib |= 5;
|
| else {
|
| - if (yasm_x86__set_rex_from_reg(rex, drex, &low3, (unsigned int)
|
| + if (yasm_x86__set_rex_from_reg(rex, &low3, (unsigned int)
|
| (X86_REG64 | basereg), bits,
|
| X86_REX_B))
|
| return 1;
|
| @@ -862,7 +861,7 @@
|
| x86_ea->sib |= 040;
|
| /* Any scale field is valid, just leave at 0. */
|
| else {
|
| - if (yasm_x86__set_rex_from_reg(rex, drex, &low3, (unsigned int)
|
| + if (yasm_x86__set_rex_from_reg(rex, &low3, (unsigned int)
|
| (X86_REG64 | indexreg), bits,
|
| X86_REX_X))
|
| return 1;
|
|
|