diff options
| author | David Schleef <ds@schleef.org> | 2011-10-15 22:51:17 +0400 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2011-10-15 22:51:17 +0400 |
| commit | 574ee1ee5025d9941e44238e846f6074fbdf2e87 (patch) | |
| tree | 8dfcf6cbb997f629572c27c004cb5643755f8ba6 | |
| parent | 4f813175b93ba44ba3f91cec28f8393d996ff918 (diff) | |
x86insn: switch to ultra-conservative nops
| -rw-r--r-- | orc/orcx86insn.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/orc/orcx86insn.c b/orc/orcx86insn.c index 78ca30d..33982e2 100644 --- a/orc/orcx86insn.c +++ b/orc/orcx86insn.c @@ -527,14 +527,6 @@ orc_uint8 nop_codes[][16] = { { 0x66, 0x0f, 0x1f, 0x44, 0x00, 0x00 }, /* nopw 0x0(%rax,%rax,1) */ { 0x0f, 0x1f, 0x80, 0x00, 0x00, 0x00, 0x00 }, /* nopl 0x0(%rax) */ { 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* nopl 0x0(%rax,%rax,1) */ -#else - { 0x90, 0x90, 0x90 }, - { 0x90, 0x90, 0x90, 0x90 }, - { 0x90, 0x90, 0x90, 0x90, 0x90 }, - { 0x66, 0x0f, 0x1f, 0x44, 0x00, 0x00 }, /* nopw 0x0(%rax,%rax,1) */ - { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }, - { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }, -#endif { 0x66, 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* nopw 0x0(%rax,%rax,1) */ /* Forms of nopw %cs:0x0(%rax,%rax,1) */ { 0x66, 0x2e, 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00 }, @@ -546,6 +538,24 @@ orc_uint8 nop_codes[][16] = { 0x00, 0x00 }, { 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x2e, 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00 }, +#else + { 0x90, 0x90, 0x90 }, + { 0x90, 0x90, 0x90, 0x90 }, + { 0x90, 0x90, 0x90, 0x90, 0x90 }, + { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }, + { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }, + { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }, + { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }, + { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }, + { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }, + { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }, + { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, + 0x90, }, + { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, + 0x90, 0x90, }, + { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, + 0x90, 0x90, 0x90, }, +#endif }; void |