Merge remote branch 'upstream/master'

[mono.git] / mono / mini / cpu-x86.md

diff --git a/mono/mini/cpu-x86.md b/mono/mini/cpu-x86.md
index 381fd0d76deaac365144fbc097b44ef898274d31..41dcbbedfad8d7080f843d9447df75dab27368de 100644 (file)
--- a/mono/mini/cpu-x86.md
+++ b/mono/mini/cpu-x86.md
@@ -65,6 +65,7 @@
 break: len:1
 jmp: len:32 clob:c
 call: dest:a clob:c len:17
+tailcall: len:120 clob:c
 br: len:5
 seq_point: len:16
 
@@ -161,6 +162,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:7
+store_mem_imm: len:12
 load_membase: dest:i src1:b len:7
 loadi1_membase: dest:y src1:b len:7
 loadu1_membase: dest:y src1:b len:7
@@ -245,6 +247,7 @@ call_handler: len:11 clob:c
 aot_const: dest:i len:5
 load_gotaddr: dest:i len:64
 got_entry: dest:i src1:b len:7
+nacl_gc_safe_point: clob:c
 x86_test_null: src1:i len:2
 x86_compare_membase_reg: src1:b src2:i len:7
 x86_compare_membase_imm: src1:b len:11
@@ -303,7 +306,7 @@ atomic_exchange_i4: src1:b src2:i dest:a len:24
 atomic_cas_i4: src1:b src2:i src3:a dest:a len:24
 memory_barrier: len:16
 
-card_table_wbarrier: src1:a src2:i clob:d len:28
+card_table_wbarrier: src1:a src2:i clob:d len:34
 
 relaxed_nop: len:2
 hard_nop: len:1
@@ -603,3 +606,7 @@ expand_r8: dest:x src1:f len:13
 
 liverange_start: len:0
 liverange_end: len:0
+gc_liveness_def: len:0
+gc_liveness_use: len:0
+gc_spill_slot_liveness_def: len:0
+gc_param_slot_liveness_def: len:0