diff options
| author | Søren Sandmann <ssp@redhat.com> | 2013-12-26 12:26:37 -0500 |
|---|---|---|
| committer | Søren Sandmann <ssp@redhat.com> | 2013-12-26 12:26:37 -0500 |
| commit | a563b63a93bd5def1b6188388cd6fb8efa4e6254 (patch) | |
| tree | 7b662beffa2b20977a8e3f0ccfa2522ce84b87a7 | |
| parent | e725c4fd710d983985f81591de5b3ff985583d5e (diff) | |
mult, not shift
| -rw-r--r-- | simplex86.c | 4 | ||||
| -rw-r--r-- | simplex86.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/simplex86.c b/simplex86.c index 753bb7b..32e78c4 100644 --- a/simplex86.c +++ b/simplex86.c @@ -1166,14 +1166,14 @@ assembler_new (const char *prefix) assembler->first_variant[serial] = variant; } + assembler->verbose = FALSE; + /* Make sure that detect_features can generate all instructions, * even those that are not supported with the current CPU. */ assembler->features = F_MASK; assembler->features = detect_features (assembler); - assembler->verbose = FALSE; - return assembler; out_code_manager: diff --git a/simplex86.h b/simplex86.h index 2fdec0d..0014495 100644 --- a/simplex86.h +++ b/simplex86.h @@ -221,9 +221,9 @@ typedef enum /* Layout: * [disp: 32] [4] [base op: 10] [index: 10] [shift: 2] [op_type: 6] */ -#define INDEX(base_reg, disp, index_reg, shift) \ +#define INDEX(base_reg, disp, index_reg, mult) \ ((OP_MEM << 0) | \ - (__SHIFT(shift) << 6) | \ + (__SHIFT(mult) << 6) | \ (((index_reg)) << 8) | \ (((base_reg)) << 18) | \ ((uint64_t)(disp)) << 32) |