Index: src/trusted/validator_x86/testdata/64/direct-jump-16.tf |
diff --git a/src/trusted/validator_x86/testdata/32/direct-jump-16.hex b/src/trusted/validator_x86/testdata/64/direct-jump-16.tf |
similarity index 56% |
copy from src/trusted/validator_x86/testdata/32/direct-jump-16.hex |
copy to src/trusted/validator_x86/testdata/64/direct-jump-16.tf |
index d593b8cbd7bdf630e317d3d96b22f6014b773218..c573d22d5988965655060a6aab3a1c6b98dfb48d 100644 |
--- a/src/trusted/validator_x86/testdata/32/direct-jump-16.hex |
+++ b/src/trusted/validator_x86/testdata/64/direct-jump-16.tf |
@@ -1,10 +1,18 @@ |
+BITS: 64 |
+OUTCOME: invalid |
+ |
# This file tests how we handle a 16-bit direct jump. In particular, it tests |
# whether we actually disallow prefix 66 on the direct jump. |
# |
# Define direct (16-bit) jump, which NaCl doesn't allow |
-66 e9 01 00 |
+hex: 66 e9 05 00 |
+nc_out: ERROR: Opcode sequence doesn't define a valid x86 instruction |
+nc_out: ERROR: Use of DATA16 (66) prefix for instruction not allowed by Native Client |
+ |
# Padding in case the parser of the previous instruction recognizes |
# the wrong byte length for the jump constant. |
-90 90 |
+asm: nop; nop; nop; nop |
+hex: 90 90 90 90 |
+ |