2008-01-16 Zoltan Varga <vargaz@gmail.com>

	* cpu-x86.md: Fix the length of some load membase opcodes. Fixes #354241.

svn path=/trunk/mono/; revision=93069

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 0560ed6f71299c5055024a54303b662d11f6ffb2..45a03fd71df8e884f8bc618d478f9fe16307a80e 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,7 @@
 2008-01-16  Zoltan Varga  <vargaz@gmail.com>
 
+       * cpu-x86.md: Fix the length of some load membase opcodes. Fixes #354241.
+
        * mini-amd64.h: Add some comments to the MonoLMF structure.
 
        * mini-ops.h cpu-amd64.c: Add a OP_AMD64_SAVE_SP_TO_LMF opcode.

diff --git a/mono/mini/cpu-x86.md b/mono/mini/cpu-x86.md
index 9dc8a4c9ca786e06bf55248588137c188636434a..7b1f297c9073a192ed5df8b6aba6508e08d2696d 100644 (file)
--- a/mono/mini/cpu-x86.md
+++ b/mono/mini/cpu-x86.md
@@ -168,18 +168,18 @@ storei4_membase_reg: dest:b src1:i len:7
 storei8_membase_imm: dest:b 
 storei8_membase_reg: dest:b src1:i 
 storer4_membase_reg: dest:b src1:f len:7
-storer8_membase_reg: dest:b src1:f len:6
-load_membase: dest:i src1:b len:6
+storer8_membase_reg: dest:b src1:f len:7
+load_membase: dest:i src1:b len:7
 loadi1_membase: dest:y src1:b len:7
 loadu1_membase: dest:y src1:b len:7
 loadi2_membase: dest:i src1:b len:7
 loadu2_membase: dest:i src1:b len:7
-loadi4_membase: dest:i src1:b len:6
-loadu4_membase: dest:i src1:b len:6
+loadi4_membase: dest:i src1:b len:7
+loadu4_membase: dest:i src1:b len:7
 loadi8_membase: dest:i src1:b
-loadr4_membase: dest:f src1:b len:6
-loadr8_membase: dest:f src1:b len:6
-loadr8_spill_membase: src1:b len:8
+loadr4_membase: dest:f src1:b len:7
+loadr8_membase: dest:f src1:b len:7
+loadr8_spill_membase: src1:b len:9
 loadu4_mem: dest:i len:9
 move: dest:i src1:i len:2
 addcc_imm: dest:i src1:i len:6 clob:1
@@ -265,15 +265,15 @@ aot_const: dest:i len:5
 load_gotaddr: dest:i len:64
 got_entry: dest:i src1:b len:7
 x86_test_null: src1:i len:2
-x86_compare_membase_reg: src1:b src2:i len:6
+x86_compare_membase_reg: src1:b src2:i len:7
 x86_compare_membase_imm: src1:b len:11
 x86_compare_membase8_imm: src1:b len:8
 x86_compare_mem_imm: len:11
-x86_compare_reg_membase: src1:i src2:b len:6
+x86_compare_reg_membase: src1:i src2:b len:7
 x86_inc_reg: dest:i src1:i clob:1 len:1
-x86_inc_membase: src1:b len:6
+x86_inc_membase: src1:b len:7
 x86_dec_reg: dest:i src1:i clob:1 len:1
-x86_dec_membase: src1:b len:6
+x86_dec_membase: src1:b len:7
 x86_add_membase_imm: src1:b len:11
 x86_sub_membase_imm: src1:b len:11
 x86_and_membase_imm: src1:b len:11
@@ -281,7 +281,7 @@ x86_or_membase_imm: src1:b len:11
 x86_xor_membase_imm: src1:b len:11
 x86_push: src1:i len:1
 x86_push_imm: len:5
-x86_push_membase: src1:b len:6
+x86_push_membase: src1:b len:7
 x86_push_obj: src1:b len:30
 x86_push_got_entry: src1:b len:7
 x86_lea: dest:i src1:i src2:i len:7