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

	* mini-ops.h *.md: Make some opcodes names uniform by removing the op_ prefix.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index a5e6a0357367aba5796be7ce8397dc129da3f941..163bfbe4e1f4120e136defe4506f7fc96141d0cc 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-16  Zoltan Varga  <vargaz@gmail.com>
+
+       * mini-ops.h *.md: Make some opcodes names uniform by removing the op_ prefix.
+
 2008-01-16  Mark Probst  <mark.probst@gmail.com>
 
        * generic-sharing.c: New type argument lookup code which uses the

diff --git a/mono/mini/cpu-alpha.md b/mono/mini/cpu-alpha.md
index 9d166cbdcdd1d2ca5c26281bd87967bdaf758a25..0473089324967afe801a48d41d33d70e2f62b953 100644 (file)
--- a/mono/mini/cpu-alpha.md
+++ b/mono/mini/cpu-alpha.md
@@ -109,7 +109,7 @@ conv.u4: dest:i src1:i len:4
 conv.u8: dest:i src1:i len:4
 conv.r.un: dest:f src1:i len:8
 throw: src1:i len:20
-op_rethrow: src1:i len:20
+rethrow: src1:i len:20
 conv.ovf.i4.un: dest:i src1:i len:16
 conv.ovf.u4.un: 
 conv.ovf.u4: dest:i src1:i len:15
@@ -304,7 +304,7 @@ fmove: dest:f src1:f len:8
 call_handler: len:4
 start_handler: len:96
 endfinally: len:96
-op_endfilter: src1:i len:96
+endfilter: src1:i len:96
 aot_const: dest:i len:10
 # x86_test_null: src1:i len:5
 # x86_compare_membase_reg: src1:b src2:i len:9
@@ -358,8 +358,8 @@ abs: dest:f src1:f len:4
 tan: dest:f src1:f len:59
 atan: dest:f src1:f len:9
 sqrt: dest:f src1:f len:32
-op_bigmul: len:3 dest:i src1:a src2:i
-op_bigmul_un: len:3 dest:i src1:a src2:i
+bigmul: len:3 dest:i src1:a src2:i
+bigmul_un: len:3 dest:i src1:a src2:i
 sext_i1: dest:i src1:i len:8
 sext_i2: dest:i src1:i len:8
 sext_i4: dest:i src1:i len:8

diff --git a/mono/mini/cpu-amd64.md b/mono/mini/cpu-amd64.md
index 4d36be3a7598809e91a9cc291ecbb6abd5d89950..bca2aadac52f9138cd59d57c6435b4b6b4e31521 100644 (file)
--- a/mono/mini/cpu-amd64.md
+++ b/mono/mini/cpu-amd64.md
@@ -107,10 +107,10 @@ conv.u8: dest:i src1:i len:3
 conv.r.un: dest:f src1:i len:8
 
 throw: src1:i len:18
-op_rethrow: src1:i len:18
+rethrow: src1:i len:18
 start_handler: len:9
 endfinally: len:9
-op_endfilter: src1:a len:9
+endfilter: src1:a len:9
 
 conv.ovf.i4.un: dest:i src1:i len:16
 conv.ovf.u4.un: 
@@ -342,8 +342,8 @@ abs: dest:f src1:f len:32
 tan: dest:f src1:f len:59
 atan: dest:f src1:f len:9
 sqrt: dest:f src1:f len:32
-op_bigmul: len:3 dest:i src1:a src2:i
-op_bigmul_un: len:3 dest:i src1:a src2:i
+bigmul: len:3 dest:i src1:a src2:i
+bigmul_un: len:3 dest:i src1:a src2:i
 sext_i1: dest:i src1:i len:4
 sext_i2: dest:i src1:i len:4
 sext_i4: dest:i src1:i len:8

diff --git a/mono/mini/cpu-arm.md b/mono/mini/cpu-arm.md
index f79c1a0f0fa13766e455ce6a77ba1b716cf4b02a..24f65d7fdac79f2fe3f8eef1e66e1a4fca9513b7 100644 (file)
--- a/mono/mini/cpu-arm.md
+++ b/mono/mini/cpu-arm.md
@@ -167,7 +167,7 @@ isinst:
 conv.r.un: dest:f src1:i len:56
 unbox:
 throw: src1:i len:24
-op_rethrow: src1:i len:20
+rethrow: src1:i len:20
 ldfld:
 ldflda:
 stfld:
@@ -529,7 +529,7 @@ float_clt: dest:i src1:f src2:f len:16
 float_clt_un: dest:i src1:f src2:f len:20
 float_conv_to_u: dest:i src1:f len:36
 call_handler: len:12
-op_endfilter: src1:i len:16
+endfilter: src1:i len:16
 aot_const: dest:i len:16
 sqrt: dest:f src1:f len:4
 adc: dest:i src1:i src2:i len:4
@@ -543,6 +543,6 @@ sbb_imm: dest:i src1:i len:12
 br_reg: src1:i len:8
 arm_rsbs_imm: dest:i src1:i len:4
 arm_rsc_imm: dest:i src1:i len:4
-op_bigmul: len:8 dest:l src1:i src2:i
-op_bigmul_un: len:8 dest:l src1:i src2:i
+bigmul: len:8 dest:l src1:i src2:i
+bigmul_un: len:8 dest:l src1:i src2:i
 tls_get: len:8 dest:i

diff --git a/mono/mini/cpu-g4.md b/mono/mini/cpu-g4.md
index f7f229dbbdff3015d291f367519f8badb6145a0f..6e09a52ad18c55a25e717dafd56267c6d7750aa5 100644 (file)
--- a/mono/mini/cpu-g4.md
+++ b/mono/mini/cpu-g4.md
@@ -166,7 +166,7 @@ isinst:
 conv.r.un: dest:f src1:i len:32
 unbox:
 throw: src1:i len:20
-op_rethrow: src1:i len:20
+rethrow: src1:i len:20
 ldfld:
 ldflda:
 stfld:
@@ -533,7 +533,7 @@ float_clt: dest:i src1:f src2:f len:16
 float_clt_un: dest:i src1:f src2:f len:20
 float_conv_to_u: dest:i src1:f len:36
 call_handler: len:12
-op_endfilter: src1:i len:16
+endfilter: src1:i len:16
 aot_const: dest:i len:8
 sqrt: dest:f src1:f len:4
 adc: dest:i src1:i src2:i len:4
@@ -547,6 +547,6 @@ sbb_imm:
 br_reg: src1:i len:8
 ppc_subfic: dest:i src1:i len:4
 ppc_subfze: dest:i src1:i len:4
-op_bigmul: len:12 dest:l src1:i src2:i
-op_bigmul_un: len:12 dest:l src1:i src2:i
+bigmul: len:12 dest:l src1:i src2:i
+bigmul_un: len:12 dest:l src1:i src2:i
 tls_get: len:8 dest:i

diff --git a/mono/mini/cpu-hppa.md b/mono/mini/cpu-hppa.md
index 44e95962fbd2cef2063364611cd81d145132231d..5ce2053fe38e920e755dc8704c9683e1c2a84735 100644 (file)
--- a/mono/mini/cpu-hppa.md
+++ b/mono/mini/cpu-hppa.md
@@ -100,7 +100,7 @@ conv.r8: dest:f src1:i len:64
 conv.u4: dest:i src1:i len:4
 conv.u8: dest:i src1:i len:4
 throw: src1:i len:64
-op_rethrow: src1:i len:64
+rethrow: src1:i len:64
 conv.ovf.u4: dest:i src1:i len:64
 ckfinite: dest:f src1:f len:40
 conv.u2: dest:i src1:i len:8
@@ -251,7 +251,7 @@ float_clt: dest:i src1:f src2:f len:64
 float_clt_un: dest:i src1:f src2:f len:64
 float_conv_to_u: dest:i src1:f len:64
 call_handler: len:64
-op_endfilter: src1:i len:64
+endfilter: src1:i len:64
 aot_const: dest:i len:64
 adc: dest:i src1:i src2:i len:4
 addcc: dest:i src1:i src2:i len:4
@@ -260,8 +260,8 @@ adc_imm: dest:i src1:i len:64
 sbb: dest:i src1:i src2:i len:4
 sbb_imm: dest:i src1:i len:64
 br_reg: src1:i len:8
-op_bigmul: len:2 dest:L src1:a src2:i
-op_bigmul_un: len:2 dest:L src1:a src2:i
+bigmul: len:2 dest:L src1:a src2:i
+bigmul_un: len:2 dest:L src1:a src2:i
 fmove: dest:f src1:f len:8
 
 # 32 bit opcodes

diff --git a/mono/mini/cpu-ia64.md b/mono/mini/cpu-ia64.md
index 90ffe3334bf44566e91e33b80e7cd4172ee988bc..602f336d353022eec4bc4ee50561be91937af47b 100644 (file)
--- a/mono/mini/cpu-ia64.md
+++ b/mono/mini/cpu-ia64.md
@@ -43,7 +43,7 @@ conv.u4: dest:i src1:i len:112
 conv.u8: dest:i src1:i len:112
 conv.r.un: dest:f src1:i len:48
 throw: src1:i len:96
-op_rethrow: src1:i len:48
+rethrow: src1:i len:48
 conv.ovf.i4.un: dest:i src1:i len:96
 conv.ovf.u4.un: 
 conv.ovf.u4: dest:i src1:i len:48
@@ -214,7 +214,7 @@ float_conv_to_u: dest:i src1:f len:48
 fmove: dest:f src1:f len:48
 call_handler: len:96
 start_handler: len:96
-op_endfilter: len:96
+endfilter: len:96
 endfinally: len:96
 endfilter: len:96
 aot_const: dest:i len:48
@@ -241,8 +241,8 @@ abs: dest:f src1:f len:48
 tan: dest:f src1:f len:48
 atan: dest:f src1:f len:48
 sqrt: dest:f src1:f len:48
-op_bigmul: len:48 dest:i src1:a src2:i
-op_bigmul_un: len:48 dest:i src1:a src2:i
+bigmul: len:48 dest:i src1:a src2:i
+bigmul_un: len:48 dest:i src1:a src2:i
 sext_i1: dest:i src1:i len:48
 sext_i2: dest:i src1:i len:48
 sext_i4: dest:i src1:i len:48

diff --git a/mono/mini/cpu-mips.md b/mono/mini/cpu-mips.md
index 0936e4dc392bed4c5bc6ff433d818ede2e6a62c6..5cae338f1aec6f211ab006bade844acdea235134 100644 (file)
--- a/mono/mini/cpu-mips.md
+++ b/mono/mini/cpu-mips.md
@@ -172,7 +172,7 @@ isinst:
 conv.r.un: dest:f src1:i len:32
 unbox:
 throw: src1:i len:24
-op_rethrow: src1:i len:24
+rethrow: src1:i len:24
 ldfld:
 ldflda:
 stfld:
@@ -523,7 +523,7 @@ float_clt: dest:i src1:f src2:f len:20
 float_clt_un: dest:i src1:f src2:f len:20
 float_conv_to_u: dest:i src1:f len:36
 call_handler: len:20
-op_endfilter: src1:i len:16
+endfilter: src1:i len:16
 aot_const: dest:i len:8
 sqrt: dest:f src1:f len:4
 adc: dest:i src1:i src2:i len:4
@@ -537,8 +537,8 @@ sbb_imm: dest:i src1:i len:12
 br_reg: src1:i len:8
 #ppc_subfic: dest:i src1:i len:4
 #ppc_subfze: dest:i src1:i len:4
-op_bigmul: len:52 dest:l src1:i src2:i
-op_bigmul_un: len:52 dest:l src1:i src2:i
+bigmul: len:52 dest:l src1:i src2:i
+bigmul_un: len:52 dest:l src1:i src2:i
 tls_get: len:8 dest:i
 mips_beq: src1:i src2:i len:24
 mips_bgez: src1:i len:24

diff --git a/mono/mini/cpu-s390.md b/mono/mini/cpu-s390.md
index 06aab5bd868697cf58e345a0ef271caf980cc690..100b75d3bf7f7aeaee9408841a760d63de6cc0db 100644 (file)
--- a/mono/mini/cpu-s390.md
+++ b/mono/mini/cpu-s390.md
@@ -418,10 +418,10 @@ newarr:
 newobj:
 nop: len:4
 not: dest:i src1:i len:8
-op_bigmul: len:2 dest:l src1:a src2:i
-op_bigmul_un: len:2 dest:l src1:a src2:i
-op_endfilter: src1:i len:12
-op_rethrow: src1:i len:8
+bigmul: len:2 dest:l src1:a src2:i
+bigmul_un: len:2 dest:l src1:a src2:i
+endfilter: src1:i len:12
+rethrow: src1:i len:8
 oparglist: src1:i len:20
 or: dest:i src1:i src2:i len:4
 or_imm: dest:i src1:i len:16

diff --git a/mono/mini/cpu-s390x.md b/mono/mini/cpu-s390x.md
index ef5c217ab92338aa3a47b34318456e8b6fba0450..219dca4b173b5b7ac90aec940ff6ef7e4ef709a1 100644 (file)
--- a/mono/mini/cpu-s390x.md
+++ b/mono/mini/cpu-s390x.md
@@ -475,10 +475,10 @@ newobj:
 nop: len:4
 not: dest:i src1:i len:12
 oparglist: src1:i len:28
-op_bigmul: len:2 dest:i src1:a src2:i
-op_bigmul_un: len:2 dest:i src1:a src2:i
-op_endfilter: src1:i len:28
-op_rethrow: src1:i len:26
+bigmul: len:2 dest:i src1:a src2:i
+bigmul_un: len:2 dest:i src1:a src2:i
+endfilter: src1:i len:28
+rethrow: src1:i len:26
 or: dest:i src1:i src2:i len:8
 or_imm: dest:i src1:i len:24
 outarg: src1:i len:1

diff --git a/mono/mini/cpu-sparc.md b/mono/mini/cpu-sparc.md
index 33f67541f18b2edcf1c1528ed13496e7b0c284f5..ce4993e8fcdcfd0eb353aa9e51f9511d46632570 100644 (file)
--- a/mono/mini/cpu-sparc.md
+++ b/mono/mini/cpu-sparc.md
@@ -111,7 +111,7 @@ conv.r8: dest:f src1:i len:64
 conv.u4: dest:i src1:i len:4
 conv.u8: dest:i src1:i len:4
 throw: src1:i len:64
-op_rethrow: src1:i len:64
+rethrow: src1:i len:64
 conv.ovf.u4: dest:i src1:i len:64
 ckfinite: dest:f src1:f len:40
 conv.u2: dest:i src1:i len:8
@@ -262,7 +262,7 @@ float_clt: dest:i src1:f src2:f len:64
 float_clt_un: dest:i src1:f src2:f len:64
 float_conv_to_u: dest:i src1:f len:64
 call_handler: len:64
-op_endfilter: src1:i len:64
+endfilter: src1:i len:64
 aot_const: dest:i len:64
 adc: dest:i src1:i src2:i len:4
 addcc: dest:i src1:i src2:i len:4
@@ -271,8 +271,8 @@ adc_imm: dest:i src1:i len:64
 sbb: dest:i src1:i src2:i len:4
 sbb_imm: dest:i src1:i len:64
 br_reg: src1:i len:8
-op_bigmul: len:2 dest:L src1:a src2:i
-op_bigmul_un: len:2 dest:L src1:a src2:i
+bigmul: len:2 dest:L src1:a src2:i
+bigmul_un: len:2 dest:L src1:a src2:i
 fmove: dest:f src1:f len:8
 
 # 32 bit opcodes

diff --git a/mono/mini/cpu-x86.md b/mono/mini/cpu-x86.md
index 83df708cd5caf079aff04396ce1f2b5574dbd54b..9dc8a4c9ca786e06bf55248588137c188636434a 100644 (file)
--- a/mono/mini/cpu-x86.md
+++ b/mono/mini/cpu-x86.md
@@ -114,10 +114,10 @@ conv.i: dest:i src1:i len:3
 int_xor: dest:i src1:i src2:i len:2 clob:1
 
 throw: src1:i len:13
-op_rethrow: src1:i len:13
+rethrow: src1:i len:13
 start_handler: len:16
 endfinally: len:16
-op_endfilter: src1:a len:16
+endfilter: src1:a len:16
 
 ckfinite: dest:f src1:f len:32
 mul.ovf: dest:i src1:i src2:i clob:1 len:9
@@ -308,8 +308,8 @@ abs: dest:f src1:f len:2
 tan: dest:f src1:f len:49
 atan: dest:f src1:f len:8
 sqrt: dest:f src1:f len:2
-op_bigmul: len:2 dest:l src1:a src2:i
-op_bigmul_un: len:2 dest:l src1:a src2:i
+bigmul: len:2 dest:l src1:a src2:i
+bigmul_un: len:2 dest:l src1:a src2:i
 sext_i1: dest:i src1:y len:3
 sext_i2: dest:i src1:y len:3
 tls_get: dest:i len:20

diff --git a/mono/mini/mini-ops.h b/mono/mini/mini-ops.h
index 2f7dd97d0c3851764afcadf9f0ad2098f7ab7c8a..235a83b9b6dd3d333a124d5357bbe7995b9b264e 100644 (file)
--- a/mono/mini/mini-ops.h
+++ b/mono/mini/mini-ops.h
@@ -65,9 +65,9 @@ MINI_OP(OP_CHECK_ARRAY_TYPE,  "check_array_type")
 MINI_OP(OP_ARRAY_RANK, "array_rank")
 MINI_OP(OP_THROW,      "throw")
 MINI_OP(OP_THROW_OR_NULL,      "throw_or_null")
-MINI_OP(OP_RETHROW,    "op_rethrow")
+MINI_OP(OP_RETHROW,    "rethrow")
 MINI_OP(OP_REFANYTYPE, "refanytype")
-MINI_OP(OP_NEWOBJ, "op_newobj")
+MINI_OP(OP_NEWOBJ, "newobj")
 
 MINI_OP(OP_STORE_MEMBASE_IMM,"store_membase_imm")
 MINI_OP(OP_STORE_MEMBASE_REG,"store_membase_reg")
@@ -447,14 +447,14 @@ MINI_OP(OP_UNBOXCAST  , "unboxcast")
 /* exception related opcodes */
 MINI_OP(OP_CALL_HANDLER  , "call_handler")
 MINI_OP(OP_START_HANDLER  , "start_handler")
-MINI_OP(OP_ENDFILTER,  "op_endfilter")
+MINI_OP(OP_ENDFILTER,  "endfilter")
 MINI_OP(OP_ENDFINALLY,  "endfinally")
 
 /* inline (long)int * (long)int */
-MINI_OP(OP_BIGMUL, "op_bigmul")
-MINI_OP(OP_BIGMUL_UN, "op_bigmul_un")
-MINI_OP(OP_MIN, "op_min")
-MINI_OP(OP_MAX, "op_max")
+MINI_OP(OP_BIGMUL, "bigmul")
+MINI_OP(OP_BIGMUL_UN, "bigmul_un")
+MINI_OP(OP_MIN, "min")
+MINI_OP(OP_MAX, "max")
 MINI_OP(OP_IMIN, "int_min")
 MINI_OP(OP_IMAX, "int_max")
 MINI_OP(OP_LMIN, "long_min")