diff options
24 files changed, 54 insertions, 118 deletions
diff --git a/runtime/interpreter/mterp/arm/op_unused_fa.S b/runtime/interpreter/mterp/arm/op_unused_fa.S deleted file mode 100644 index 10948dc06c..0000000000 --- a/runtime/interpreter/mterp/arm/op_unused_fa.S +++ /dev/null @@ -1 +0,0 @@ -%include "arm/unused.S" diff --git a/runtime/interpreter/mterp/arm/op_unused_fb.S b/runtime/interpreter/mterp/arm/op_unused_fb.S deleted file mode 100644 index 10948dc06c..0000000000 --- a/runtime/interpreter/mterp/arm/op_unused_fb.S +++ /dev/null @@ -1 +0,0 @@ -%include "arm/unused.S" diff --git a/runtime/interpreter/mterp/arm64/op_unused_fa.S b/runtime/interpreter/mterp/arm64/op_unused_fa.S deleted file mode 100644 index 204eceff7e..0000000000 --- a/runtime/interpreter/mterp/arm64/op_unused_fa.S +++ /dev/null @@ -1 +0,0 @@ -%include "arm64/unused.S" diff --git a/runtime/interpreter/mterp/arm64/op_unused_fb.S b/runtime/interpreter/mterp/arm64/op_unused_fb.S deleted file mode 100644 index 204eceff7e..0000000000 --- a/runtime/interpreter/mterp/arm64/op_unused_fb.S +++ /dev/null @@ -1 +0,0 @@ -%include "arm64/unused.S" diff --git a/runtime/interpreter/mterp/config_arm b/runtime/interpreter/mterp/config_arm index b6caf1195e..6d9774c223 100644 --- a/runtime/interpreter/mterp/config_arm +++ b/runtime/interpreter/mterp/config_arm @@ -286,8 +286,8 @@ op-start arm # op op_unused_f7 FALLBACK # op op_unused_f8 FALLBACK # op op_unused_f9 FALLBACK - # op op_unused_fa FALLBACK - # op op_unused_fb FALLBACK + op op_invoke_polymorphic FALLBACK + op op_invoke_polymorphic_range FALLBACK # op op_unused_fc FALLBACK # op op_unused_fd FALLBACK # op op_unused_fe FALLBACK diff --git a/runtime/interpreter/mterp/config_arm64 b/runtime/interpreter/mterp/config_arm64 index c5e06c7236..9f32695664 100644 --- a/runtime/interpreter/mterp/config_arm64 +++ b/runtime/interpreter/mterp/config_arm64 @@ -284,8 +284,8 @@ op-start arm64 # op op_unused_f7 FALLBACK # op op_unused_f8 FALLBACK # op op_unused_f9 FALLBACK - # op op_unused_fa FALLBACK - # op op_unused_fb FALLBACK + op op_invoke_polymorphic FALLBACK + op op_invoke_polymorphic_range FALLBACK # op op_unused_fc FALLBACK # op op_unused_fd FALLBACK # op op_unused_fe FALLBACK diff --git a/runtime/interpreter/mterp/config_mips b/runtime/interpreter/mterp/config_mips index 515cb0b591..708a22b6a4 100644 --- a/runtime/interpreter/mterp/config_mips +++ b/runtime/interpreter/mterp/config_mips @@ -286,8 +286,8 @@ op-start mips # op op_unused_f7 FALLBACK # op op_unused_f8 FALLBACK # op op_unused_f9 FALLBACK - # op op_unused_fa FALLBACK - # op op_unused_fb FALLBACK + op op_invoke_polymorphic FALLBACK + op op_invoke_polymorphic_range FALLBACK # op op_unused_fc FALLBACK # op op_unused_fd FALLBACK # op op_unused_fe FALLBACK diff --git a/runtime/interpreter/mterp/config_mips64 b/runtime/interpreter/mterp/config_mips64 index aafd248821..7643a4829e 100644 --- a/runtime/interpreter/mterp/config_mips64 +++ b/runtime/interpreter/mterp/config_mips64 @@ -286,8 +286,8 @@ op-start mips64 # op op_unused_f7 FALLBACK # op op_unused_f8 FALLBACK # op op_unused_f9 FALLBACK - # op op_unused_fa FALLBACK - # op op_unused_fb FALLBACK + op op_invoke_polymorphic FALLBACK + op op_invoke_polymorphic_range FALLBACK # op op_unused_fc FALLBACK # op op_unused_fd FALLBACK # op op_unused_fe FALLBACK diff --git a/runtime/interpreter/mterp/config_x86 b/runtime/interpreter/mterp/config_x86 index 64d8ee8369..f454786682 100644 --- a/runtime/interpreter/mterp/config_x86 +++ b/runtime/interpreter/mterp/config_x86 @@ -290,8 +290,8 @@ op-start x86 # op op_unused_f7 FALLBACK # op op_unused_f8 FALLBACK # op op_unused_f9 FALLBACK - # op op_unused_fa FALLBACK - # op op_unused_fb FALLBACK + op op_invoke_polymorphic FALLBACK + op op_invoke_polymorphic_range FALLBACK # op op_unused_fc FALLBACK # op op_unused_fd FALLBACK # op op_unused_fe FALLBACK diff --git a/runtime/interpreter/mterp/config_x86_64 b/runtime/interpreter/mterp/config_x86_64 index 7c357db974..dbfd3d18fc 100644 --- a/runtime/interpreter/mterp/config_x86_64 +++ b/runtime/interpreter/mterp/config_x86_64 @@ -290,8 +290,8 @@ op-start x86_64 # op op_unused_f7 FALLBACK # op op_unused_f8 FALLBACK # op op_unused_f9 FALLBACK - # op op_unused_fa FALLBACK - # op op_unused_fb FALLBACK + op op_invoke_polymorphic FALLBACK + op op_invoke_polymorphic_range FALLBACK # op op_unused_fc FALLBACK # op op_unused_fd FALLBACK # op op_unused_fe FALLBACK diff --git a/runtime/interpreter/mterp/mips/op_unused_fa.S b/runtime/interpreter/mterp/mips/op_unused_fa.S deleted file mode 100644 index 99ef3cf308..0000000000 --- a/runtime/interpreter/mterp/mips/op_unused_fa.S +++ /dev/null @@ -1 +0,0 @@ -%include "mips/unused.S" diff --git a/runtime/interpreter/mterp/mips/op_unused_fb.S b/runtime/interpreter/mterp/mips/op_unused_fb.S deleted file mode 100644 index 99ef3cf308..0000000000 --- a/runtime/interpreter/mterp/mips/op_unused_fb.S +++ /dev/null @@ -1 +0,0 @@ -%include "mips/unused.S" diff --git a/runtime/interpreter/mterp/mips64/op_unused_fa.S b/runtime/interpreter/mterp/mips64/op_unused_fa.S deleted file mode 100644 index 29463d73fc..0000000000 --- a/runtime/interpreter/mterp/mips64/op_unused_fa.S +++ /dev/null @@ -1 +0,0 @@ -%include "mips64/unused.S" diff --git a/runtime/interpreter/mterp/mips64/op_unused_fb.S b/runtime/interpreter/mterp/mips64/op_unused_fb.S deleted file mode 100644 index 29463d73fc..0000000000 --- a/runtime/interpreter/mterp/mips64/op_unused_fb.S +++ /dev/null @@ -1 +0,0 @@ -%include "mips64/unused.S" diff --git a/runtime/interpreter/mterp/out/mterp_arm.S b/runtime/interpreter/mterp/out/mterp_arm.S index c33df6d4db..78a90af54f 100644 --- a/runtime/interpreter/mterp/out/mterp_arm.S +++ b/runtime/interpreter/mterp/out/mterp_arm.S @@ -7305,24 +7305,16 @@ constvalop_long_to_double: /* ------------------------------ */ .balign 128 -.L_op_unused_fa: /* 0xfa */ -/* File: arm/op_unused_fa.S */ -/* File: arm/unused.S */ -/* - * Bail to reference interpreter to throw. - */ - b MterpFallback +.L_op_invoke_polymorphic: /* 0xfa */ +/* Transfer stub to alternate interpreter */ + b MterpFallback /* ------------------------------ */ .balign 128 -.L_op_unused_fb: /* 0xfb */ -/* File: arm/op_unused_fb.S */ -/* File: arm/unused.S */ -/* - * Bail to reference interpreter to throw. - */ - b MterpFallback +.L_op_invoke_polymorphic_range: /* 0xfb */ +/* Transfer stub to alternate interpreter */ + b MterpFallback /* ------------------------------ */ @@ -11734,7 +11726,7 @@ artMterpAsmAltInstructionStart = .L_ALT_op_nop /* ------------------------------ */ .balign 128 -.L_ALT_op_unused_fa: /* 0xfa */ +.L_ALT_op_invoke_polymorphic: /* 0xfa */ /* File: arm/alt_stub.S */ /* * Inter-instruction transfer stub. Call out to MterpCheckBefore to handle @@ -11751,7 +11743,7 @@ artMterpAsmAltInstructionStart = .L_ALT_op_nop /* ------------------------------ */ .balign 128 -.L_ALT_op_unused_fb: /* 0xfb */ +.L_ALT_op_invoke_polymorphic_range: /* 0xfb */ /* File: arm/alt_stub.S */ /* * Inter-instruction transfer stub. Call out to MterpCheckBefore to handle diff --git a/runtime/interpreter/mterp/out/mterp_arm64.S b/runtime/interpreter/mterp/out/mterp_arm64.S index c7303b9c3f..dafcc3ef6a 100644 --- a/runtime/interpreter/mterp/out/mterp_arm64.S +++ b/runtime/interpreter/mterp/out/mterp_arm64.S @@ -6862,24 +6862,16 @@ artMterpAsmInstructionStart = .L_op_nop /* ------------------------------ */ .balign 128 -.L_op_unused_fa: /* 0xfa */ -/* File: arm64/op_unused_fa.S */ -/* File: arm64/unused.S */ -/* - * Bail to reference interpreter to throw. - */ - b MterpFallback +.L_op_invoke_polymorphic: /* 0xfa */ +/* Transfer stub to alternate interpreter */ + b MterpFallback /* ------------------------------ */ .balign 128 -.L_op_unused_fb: /* 0xfb */ -/* File: arm64/op_unused_fb.S */ -/* File: arm64/unused.S */ -/* - * Bail to reference interpreter to throw. - */ - b MterpFallback +.L_op_invoke_polymorphic_range: /* 0xfb */ +/* Transfer stub to alternate interpreter */ + b MterpFallback /* ------------------------------ */ @@ -11519,7 +11511,7 @@ artMterpAsmAltInstructionStart = .L_ALT_op_nop /* ------------------------------ */ .balign 128 -.L_ALT_op_unused_fa: /* 0xfa */ +.L_ALT_op_invoke_polymorphic: /* 0xfa */ /* File: arm64/alt_stub.S */ /* * Inter-instruction transfer stub. Call out to MterpCheckBefore to handle @@ -11536,7 +11528,7 @@ artMterpAsmAltInstructionStart = .L_ALT_op_nop /* ------------------------------ */ .balign 128 -.L_ALT_op_unused_fb: /* 0xfb */ +.L_ALT_op_invoke_polymorphic_range: /* 0xfb */ /* File: arm64/alt_stub.S */ /* * Inter-instruction transfer stub. Call out to MterpCheckBefore to handle diff --git a/runtime/interpreter/mterp/out/mterp_mips.S b/runtime/interpreter/mterp/out/mterp_mips.S index fef7dc6816..aadbf20454 100644 --- a/runtime/interpreter/mterp/out/mterp_mips.S +++ b/runtime/interpreter/mterp/out/mterp_mips.S @@ -7624,25 +7624,15 @@ artMterpAsmInstructionStart = .L_op_nop /* ------------------------------ */ .balign 128 -.L_op_unused_fa: /* 0xfa */ -/* File: mips/op_unused_fa.S */ -/* File: mips/unused.S */ -/* - * Bail to reference interpreter to throw. - */ - b MterpFallback - +.L_op_invoke_polymorphic: /* 0xfa */ +/* Transfer stub to alternate interpreter */ + b MterpFallback /* ------------------------------ */ .balign 128 -.L_op_unused_fb: /* 0xfb */ -/* File: mips/op_unused_fb.S */ -/* File: mips/unused.S */ -/* - * Bail to reference interpreter to throw. - */ - b MterpFallback - +.L_op_invoke_polymorphic_range: /* 0xfb */ +/* Transfer stub to alternate interpreter */ + b MterpFallback /* ------------------------------ */ .balign 128 @@ -12537,7 +12527,7 @@ artMterpAsmAltInstructionStart = .L_ALT_op_nop /* ------------------------------ */ .balign 128 -.L_ALT_op_unused_fa: /* 0xfa */ +.L_ALT_op_invoke_polymorphic: /* 0xfa */ /* File: mips/alt_stub.S */ /* * Inter-instruction transfer stub. Call out to MterpCheckBefore to handle @@ -12555,7 +12545,7 @@ artMterpAsmAltInstructionStart = .L_ALT_op_nop /* ------------------------------ */ .balign 128 -.L_ALT_op_unused_fb: /* 0xfb */ +.L_ALT_op_invoke_polymorphic_range: /* 0xfb */ /* File: mips/alt_stub.S */ /* * Inter-instruction transfer stub. Call out to MterpCheckBefore to handle diff --git a/runtime/interpreter/mterp/out/mterp_mips64.S b/runtime/interpreter/mterp/out/mterp_mips64.S index 88e972ffb3..143aeb034c 100644 --- a/runtime/interpreter/mterp/out/mterp_mips64.S +++ b/runtime/interpreter/mterp/out/mterp_mips64.S @@ -7080,26 +7080,16 @@ artMterpAsmInstructionStart = .L_op_nop /* ------------------------------ */ .balign 128 -.L_op_unused_fa: /* 0xfa */ -/* File: mips64/op_unused_fa.S */ -/* File: mips64/unused.S */ -/* - * Bail to reference interpreter to throw. - */ +.L_op_invoke_polymorphic: /* 0xfa */ +/* Transfer stub to alternate interpreter */ b MterpFallback - /* ------------------------------ */ .balign 128 -.L_op_unused_fb: /* 0xfb */ -/* File: mips64/op_unused_fb.S */ -/* File: mips64/unused.S */ -/* - * Bail to reference interpreter to throw. - */ +.L_op_invoke_polymorphic_range: /* 0xfb */ +/* Transfer stub to alternate interpreter */ b MterpFallback - /* ------------------------------ */ .balign 128 .L_op_unused_fc: /* 0xfc */ @@ -11962,7 +11952,7 @@ artMterpAsmAltInstructionStart = .L_ALT_op_nop /* ------------------------------ */ .balign 128 -.L_ALT_op_unused_fa: /* 0xfa */ +.L_ALT_op_invoke_polymorphic: /* 0xfa */ /* File: mips64/alt_stub.S */ /* * Inter-instruction transfer stub. Call out to MterpCheckBefore to handle @@ -11981,7 +11971,7 @@ artMterpAsmAltInstructionStart = .L_ALT_op_nop /* ------------------------------ */ .balign 128 -.L_ALT_op_unused_fb: /* 0xfb */ +.L_ALT_op_invoke_polymorphic_range: /* 0xfb */ /* File: mips64/alt_stub.S */ /* * Inter-instruction transfer stub. Call out to MterpCheckBefore to handle diff --git a/runtime/interpreter/mterp/out/mterp_x86.S b/runtime/interpreter/mterp/out/mterp_x86.S index 29ee2489c7..d676fdab96 100644 --- a/runtime/interpreter/mterp/out/mterp_x86.S +++ b/runtime/interpreter/mterp/out/mterp_x86.S @@ -6278,23 +6278,15 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop /* ------------------------------ */ .balign 128 -.L_op_unused_fa: /* 0xfa */ -/* File: x86/op_unused_fa.S */ -/* File: x86/unused.S */ -/* - * Bail to reference interpreter to throw. - */ +.L_op_invoke_polymorphic: /* 0xfa */ +/* Transfer stub to alternate interpreter */ jmp MterpFallback /* ------------------------------ */ .balign 128 -.L_op_unused_fb: /* 0xfb */ -/* File: x86/op_unused_fb.S */ -/* File: x86/unused.S */ -/* - * Bail to reference interpreter to throw. - */ +.L_op_invoke_polymorphic_range: /* 0xfb */ +/* Transfer stub to alternate interpreter */ jmp MterpFallback @@ -12370,7 +12362,7 @@ SYMBOL(artMterpAsmAltInstructionStart) = .L_ALT_op_nop /* ------------------------------ */ .balign 128 -.L_ALT_op_unused_fa: /* 0xfa */ +.L_ALT_op_invoke_polymorphic: /* 0xfa */ /* File: x86/alt_stub.S */ /* * Inter-instruction transfer stub. Call out to MterpCheckBefore to handle @@ -12394,7 +12386,7 @@ SYMBOL(artMterpAsmAltInstructionStart) = .L_ALT_op_nop /* ------------------------------ */ .balign 128 -.L_ALT_op_unused_fb: /* 0xfb */ +.L_ALT_op_invoke_polymorphic_range: /* 0xfb */ /* File: x86/alt_stub.S */ /* * Inter-instruction transfer stub. Call out to MterpCheckBefore to handle diff --git a/runtime/interpreter/mterp/out/mterp_x86_64.S b/runtime/interpreter/mterp/out/mterp_x86_64.S index bc1abcc2f2..df88499a62 100644 --- a/runtime/interpreter/mterp/out/mterp_x86_64.S +++ b/runtime/interpreter/mterp/out/mterp_x86_64.S @@ -6043,23 +6043,15 @@ movswl %ax, %eax /* ------------------------------ */ .balign 128 -.L_op_unused_fa: /* 0xfa */ -/* File: x86_64/op_unused_fa.S */ -/* File: x86_64/unused.S */ -/* - * Bail to reference interpreter to throw. - */ +.L_op_invoke_polymorphic: /* 0xfa */ +/* Transfer stub to alternate interpreter */ jmp MterpFallback /* ------------------------------ */ .balign 128 -.L_op_unused_fb: /* 0xfb */ -/* File: x86_64/op_unused_fb.S */ -/* File: x86_64/unused.S */ -/* - * Bail to reference interpreter to throw. - */ +.L_op_invoke_polymorphic_range: /* 0xfb */ +/* Transfer stub to alternate interpreter */ jmp MterpFallback @@ -11635,7 +11627,7 @@ SYMBOL(artMterpAsmAltInstructionStart) = .L_ALT_op_nop /* ------------------------------ */ .balign 128 -.L_ALT_op_unused_fa: /* 0xfa */ +.L_ALT_op_invoke_polymorphic: /* 0xfa */ /* File: x86_64/alt_stub.S */ /* * Inter-instruction transfer stub. Call out to MterpCheckBefore to handle @@ -11657,7 +11649,7 @@ SYMBOL(artMterpAsmAltInstructionStart) = .L_ALT_op_nop /* ------------------------------ */ .balign 128 -.L_ALT_op_unused_fb: /* 0xfb */ +.L_ALT_op_invoke_polymorphic_range: /* 0xfb */ /* File: x86_64/alt_stub.S */ /* * Inter-instruction transfer stub. Call out to MterpCheckBefore to handle diff --git a/runtime/interpreter/mterp/x86/op_unused_fa.S b/runtime/interpreter/mterp/x86/op_unused_fa.S deleted file mode 100644 index 31d98c1f39..0000000000 --- a/runtime/interpreter/mterp/x86/op_unused_fa.S +++ /dev/null @@ -1 +0,0 @@ -%include "x86/unused.S" diff --git a/runtime/interpreter/mterp/x86/op_unused_fb.S b/runtime/interpreter/mterp/x86/op_unused_fb.S deleted file mode 100644 index 31d98c1f39..0000000000 --- a/runtime/interpreter/mterp/x86/op_unused_fb.S +++ /dev/null @@ -1 +0,0 @@ -%include "x86/unused.S" diff --git a/runtime/interpreter/mterp/x86_64/op_unused_fa.S b/runtime/interpreter/mterp/x86_64/op_unused_fa.S deleted file mode 100644 index 280615f08b..0000000000 --- a/runtime/interpreter/mterp/x86_64/op_unused_fa.S +++ /dev/null @@ -1 +0,0 @@ -%include "x86_64/unused.S" diff --git a/runtime/interpreter/mterp/x86_64/op_unused_fb.S b/runtime/interpreter/mterp/x86_64/op_unused_fb.S deleted file mode 100644 index 280615f08b..0000000000 --- a/runtime/interpreter/mterp/x86_64/op_unused_fb.S +++ /dev/null @@ -1 +0,0 @@ -%include "x86_64/unused.S" |