diff options
175 files changed, 574 insertions, 560 deletions
diff --git a/runtime/interpreter/mterp/arm/op_iget.S b/runtime/interpreter/mterp/arm/op_iget.S index c45880b1c4..1684a768df 100644 --- a/runtime/interpreter/mterp/arm/op_iget.S +++ b/runtime/interpreter/mterp/arm/op_iget.S @@ -1,4 +1,4 @@ -%default { "is_object":"0", "helper":"artGet32InstanceFromMterp"} +%default { "is_object":"0", "helper":"MterpIGetU32"} /* * General instance field get. * diff --git a/runtime/interpreter/mterp/arm/op_iget_boolean.S b/runtime/interpreter/mterp/arm/op_iget_boolean.S index 9da6c8add6..f23cb3aa97 100644 --- a/runtime/interpreter/mterp/arm/op_iget_boolean.S +++ b/runtime/interpreter/mterp/arm/op_iget_boolean.S @@ -1 +1 @@ -%include "arm/op_iget.S" { "helper":"artGetBooleanInstanceFromMterp" } +%include "arm/op_iget.S" { "helper":"MterpIGetU8" } diff --git a/runtime/interpreter/mterp/arm/op_iget_byte.S b/runtime/interpreter/mterp/arm/op_iget_byte.S index 3d1f52d359..9c4f37c8ac 100644 --- a/runtime/interpreter/mterp/arm/op_iget_byte.S +++ b/runtime/interpreter/mterp/arm/op_iget_byte.S @@ -1 +1 @@ -%include "arm/op_iget.S" { "helper":"artGetByteInstanceFromMterp" } +%include "arm/op_iget.S" { "helper":"MterpIGetI8" } diff --git a/runtime/interpreter/mterp/arm/op_iget_char.S b/runtime/interpreter/mterp/arm/op_iget_char.S index 6b7154d8b9..80c4227ed2 100644 --- a/runtime/interpreter/mterp/arm/op_iget_char.S +++ b/runtime/interpreter/mterp/arm/op_iget_char.S @@ -1 +1 @@ -%include "arm/op_iget.S" { "helper":"artGetCharInstanceFromMterp" } +%include "arm/op_iget.S" { "helper":"MterpIGetU16" } diff --git a/runtime/interpreter/mterp/arm/op_iget_object.S b/runtime/interpreter/mterp/arm/op_iget_object.S index a35b1c8976..e30b129efe 100644 --- a/runtime/interpreter/mterp/arm/op_iget_object.S +++ b/runtime/interpreter/mterp/arm/op_iget_object.S @@ -1 +1 @@ -%include "arm/op_iget.S" { "is_object":"1", "helper":"artGetObjInstanceFromMterp" } +%include "arm/op_iget.S" { "is_object":"1", "helper":"MterpIGetObj" } diff --git a/runtime/interpreter/mterp/arm/op_iget_short.S b/runtime/interpreter/mterp/arm/op_iget_short.S index 3254c07fd1..dd6bc9991c 100644 --- a/runtime/interpreter/mterp/arm/op_iget_short.S +++ b/runtime/interpreter/mterp/arm/op_iget_short.S @@ -1 +1 @@ -%include "arm/op_iget.S" { "helper":"artGetShortInstanceFromMterp" } +%include "arm/op_iget.S" { "helper":"MterpIGetI16" } diff --git a/runtime/interpreter/mterp/arm/op_iget_wide.S b/runtime/interpreter/mterp/arm/op_iget_wide.S index 30405bd94c..46e9ec869b 100644 --- a/runtime/interpreter/mterp/arm/op_iget_wide.S +++ b/runtime/interpreter/mterp/arm/op_iget_wide.S @@ -9,7 +9,7 @@ GET_VREG r1, r1 @ r1<- fp[B], the object pointer ldr r2, [rFP, #OFF_FP_METHOD] @ r2<- referrer mov r3, rSELF @ r3<- self - bl artGet64InstanceFromMterp + bl MterpIGetU64 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] ubfx r2, rINST, #8, #4 @ r2<- A PREFETCH_INST 2 diff --git a/runtime/interpreter/mterp/arm/op_iput.S b/runtime/interpreter/mterp/arm/op_iput.S index d224cd8a77..a16795da64 100644 --- a/runtime/interpreter/mterp/arm/op_iput.S +++ b/runtime/interpreter/mterp/arm/op_iput.S @@ -1,11 +1,11 @@ -%default { "is_object":"0", "handler":"artSet32InstanceFromMterp" } +%default { "is_object":"0", "helper":"MterpIPutU32" } /* * General 32-bit instance field put. * * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern $handler + .extern $helper EXPORT_PC FETCH r0, 1 @ r0<- field ref CCCC mov r1, rINST, lsr #12 @ r1<- B @@ -14,7 +14,7 @@ GET_VREG r2, r2 @ r2<- fp[A] ldr r3, [rFP, #OFF_FP_METHOD] @ r3<- referrer PREFETCH_INST 2 - bl $handler + bl $helper cmp r0, #0 bne MterpPossibleException ADVANCE 2 @ advance rPC diff --git a/runtime/interpreter/mterp/arm/op_iput_boolean.S b/runtime/interpreter/mterp/arm/op_iput_boolean.S index c9e8589de5..57edadddd7 100644 --- a/runtime/interpreter/mterp/arm/op_iput_boolean.S +++ b/runtime/interpreter/mterp/arm/op_iput_boolean.S @@ -1 +1 @@ -%include "arm/op_iput.S" { "handler":"artSet8InstanceFromMterp" } +%include "arm/op_iput.S" { "helper":"MterpIPutU8" } diff --git a/runtime/interpreter/mterp/arm/op_iput_byte.S b/runtime/interpreter/mterp/arm/op_iput_byte.S index c9e8589de5..ab283b90fb 100644 --- a/runtime/interpreter/mterp/arm/op_iput_byte.S +++ b/runtime/interpreter/mterp/arm/op_iput_byte.S @@ -1 +1 @@ -%include "arm/op_iput.S" { "handler":"artSet8InstanceFromMterp" } +%include "arm/op_iput.S" { "helper":"MterpIPutI8" } diff --git a/runtime/interpreter/mterp/arm/op_iput_char.S b/runtime/interpreter/mterp/arm/op_iput_char.S index 5046f6b6a3..0fe5d964cc 100644 --- a/runtime/interpreter/mterp/arm/op_iput_char.S +++ b/runtime/interpreter/mterp/arm/op_iput_char.S @@ -1 +1 @@ -%include "arm/op_iput.S" { "handler":"artSet16InstanceFromMterp" } +%include "arm/op_iput.S" { "helper":"MterpIPutU16" } diff --git a/runtime/interpreter/mterp/arm/op_iput_object.S b/runtime/interpreter/mterp/arm/op_iput_object.S index d942e846f2..4f401eb4f0 100644 --- a/runtime/interpreter/mterp/arm/op_iput_object.S +++ b/runtime/interpreter/mterp/arm/op_iput_object.S @@ -3,7 +3,7 @@ mov r1, rPC mov r2, rINST mov r3, rSELF - bl MterpIputObject + bl MterpIPutObj cmp r0, #0 beq MterpException FETCH_ADVANCE_INST 2 @ advance rPC, load rINST diff --git a/runtime/interpreter/mterp/arm/op_iput_short.S b/runtime/interpreter/mterp/arm/op_iput_short.S index 5046f6b6a3..cc983630ff 100644 --- a/runtime/interpreter/mterp/arm/op_iput_short.S +++ b/runtime/interpreter/mterp/arm/op_iput_short.S @@ -1 +1 @@ -%include "arm/op_iput.S" { "handler":"artSet16InstanceFromMterp" } +%include "arm/op_iput.S" { "helper":"MterpIPutI16" } diff --git a/runtime/interpreter/mterp/arm/op_iput_wide.S b/runtime/interpreter/mterp/arm/op_iput_wide.S index 3dda1877b5..6a414738d9 100644 --- a/runtime/interpreter/mterp/arm/op_iput_wide.S +++ b/runtime/interpreter/mterp/arm/op_iput_wide.S @@ -1,5 +1,5 @@ /* iput-wide vA, vB, field@CCCC */ - .extern artSet64InstanceFromMterp + .extern MterpIPutU64 EXPORT_PC FETCH r0, 1 @ r0<- field ref CCCC mov r1, rINST, lsr #12 @ r1<- B @@ -8,7 +8,7 @@ VREG_INDEX_TO_ADDR r2, r2 @ r2<- &fp[A] ldr r3, [rFP, #OFF_FP_METHOD] @ r3<- referrer PREFETCH_INST 2 - bl artSet64InstanceFromMterp + bl MterpIPutU64 cmp r0, #0 bne MterpPossibleException ADVANCE 2 @ advance rPC diff --git a/runtime/interpreter/mterp/arm/op_sget.S b/runtime/interpreter/mterp/arm/op_sget.S index 3c813efb31..575a8c0760 100644 --- a/runtime/interpreter/mterp/arm/op_sget.S +++ b/runtime/interpreter/mterp/arm/op_sget.S @@ -1,4 +1,4 @@ -%default { "is_object":"0", "helper":"MterpGet32Static" } +%default { "is_object":"0", "helper":"MterpSGetU32" } /* * General SGET handler wrapper. * diff --git a/runtime/interpreter/mterp/arm/op_sget_boolean.S b/runtime/interpreter/mterp/arm/op_sget_boolean.S index eb06aa881c..df1a0246b5 100644 --- a/runtime/interpreter/mterp/arm/op_sget_boolean.S +++ b/runtime/interpreter/mterp/arm/op_sget_boolean.S @@ -1 +1 @@ -%include "arm/op_sget.S" {"helper":"MterpGetBooleanStatic"} +%include "arm/op_sget.S" {"helper":"MterpSGetU8"} diff --git a/runtime/interpreter/mterp/arm/op_sget_byte.S b/runtime/interpreter/mterp/arm/op_sget_byte.S index 9f4c9046a2..8ad3ff0e65 100644 --- a/runtime/interpreter/mterp/arm/op_sget_byte.S +++ b/runtime/interpreter/mterp/arm/op_sget_byte.S @@ -1 +1 @@ -%include "arm/op_sget.S" {"helper":"MterpGetByteStatic"} +%include "arm/op_sget.S" {"helper":"MterpSGetI8"} diff --git a/runtime/interpreter/mterp/arm/op_sget_char.S b/runtime/interpreter/mterp/arm/op_sget_char.S index dd8c991264..523951490a 100644 --- a/runtime/interpreter/mterp/arm/op_sget_char.S +++ b/runtime/interpreter/mterp/arm/op_sget_char.S @@ -1 +1 @@ -%include "arm/op_sget.S" {"helper":"MterpGetCharStatic"} +%include "arm/op_sget.S" {"helper":"MterpSGetU16"} diff --git a/runtime/interpreter/mterp/arm/op_sget_object.S b/runtime/interpreter/mterp/arm/op_sget_object.S index e1d9eaee29..e61a5a7b21 100644 --- a/runtime/interpreter/mterp/arm/op_sget_object.S +++ b/runtime/interpreter/mterp/arm/op_sget_object.S @@ -1 +1 @@ -%include "arm/op_sget.S" {"is_object":"1", "helper":"MterpGetObjStatic"} +%include "arm/op_sget.S" {"is_object":"1", "helper":"MterpSGetObj"} diff --git a/runtime/interpreter/mterp/arm/op_sget_short.S b/runtime/interpreter/mterp/arm/op_sget_short.S index c0d61c4d33..49493ebc68 100644 --- a/runtime/interpreter/mterp/arm/op_sget_short.S +++ b/runtime/interpreter/mterp/arm/op_sget_short.S @@ -1 +1 @@ -%include "arm/op_sget.S" {"helper":"MterpGetShortStatic"} +%include "arm/op_sget.S" {"helper":"MterpSGetI16"} diff --git a/runtime/interpreter/mterp/arm/op_sget_wide.S b/runtime/interpreter/mterp/arm/op_sget_wide.S index aeee016294..5981ec4957 100644 --- a/runtime/interpreter/mterp/arm/op_sget_wide.S +++ b/runtime/interpreter/mterp/arm/op_sget_wide.S @@ -4,12 +4,12 @@ */ /* sget-wide vAA, field@BBBB */ - .extern MterpGet64Static + .extern MterpSGetU64 EXPORT_PC FETCH r0, 1 @ r0<- field ref BBBB ldr r1, [rFP, #OFF_FP_METHOD] mov r2, rSELF - bl MterpGet64Static + bl MterpSGetU64 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] mov r9, rINST, lsr #8 @ r9<- AA VREG_INDEX_TO_ADDR lr, r9 @ r9<- &fp[AA] diff --git a/runtime/interpreter/mterp/arm/op_sput.S b/runtime/interpreter/mterp/arm/op_sput.S index 494df8aa5d..c4a8978cd1 100644 --- a/runtime/interpreter/mterp/arm/op_sput.S +++ b/runtime/interpreter/mterp/arm/op_sput.S @@ -1,4 +1,4 @@ -%default { "helper":"MterpSet32Static"} +%default { "helper":"MterpSPutU32"} /* * General SPUT handler wrapper. * diff --git a/runtime/interpreter/mterp/arm/op_sput_boolean.S b/runtime/interpreter/mterp/arm/op_sput_boolean.S index 47bed0a2ce..0c37623fb6 100644 --- a/runtime/interpreter/mterp/arm/op_sput_boolean.S +++ b/runtime/interpreter/mterp/arm/op_sput_boolean.S @@ -1 +1 @@ -%include "arm/op_sput.S" {"helper":"MterpSetBooleanStatic"} +%include "arm/op_sput.S" {"helper":"MterpSPutU8"} diff --git a/runtime/interpreter/mterp/arm/op_sput_byte.S b/runtime/interpreter/mterp/arm/op_sput_byte.S index b4d22b4fd8..8d4e754229 100644 --- a/runtime/interpreter/mterp/arm/op_sput_byte.S +++ b/runtime/interpreter/mterp/arm/op_sput_byte.S @@ -1 +1 @@ -%include "arm/op_sput.S" {"helper":"MterpSetByteStatic"} +%include "arm/op_sput.S" {"helper":"MterpSPutI8"} diff --git a/runtime/interpreter/mterp/arm/op_sput_char.S b/runtime/interpreter/mterp/arm/op_sput_char.S index 58a957d1f6..442b56f7b1 100644 --- a/runtime/interpreter/mterp/arm/op_sput_char.S +++ b/runtime/interpreter/mterp/arm/op_sput_char.S @@ -1 +1 @@ -%include "arm/op_sput.S" {"helper":"MterpSetCharStatic"} +%include "arm/op_sput.S" {"helper":"MterpSPutU16"} diff --git a/runtime/interpreter/mterp/arm/op_sput_object.S b/runtime/interpreter/mterp/arm/op_sput_object.S index 6d3a9a7110..c58918fbbb 100644 --- a/runtime/interpreter/mterp/arm/op_sput_object.S +++ b/runtime/interpreter/mterp/arm/op_sput_object.S @@ -3,7 +3,7 @@ mov r1, rPC mov r2, rINST mov r3, rSELF - bl MterpSputObject + bl MterpSPutObj cmp r0, #0 beq MterpException FETCH_ADVANCE_INST 2 @ advance rPC, load rINST diff --git a/runtime/interpreter/mterp/arm/op_sput_short.S b/runtime/interpreter/mterp/arm/op_sput_short.S index 88c321127e..0eb533fe3c 100644 --- a/runtime/interpreter/mterp/arm/op_sput_short.S +++ b/runtime/interpreter/mterp/arm/op_sput_short.S @@ -1 +1 @@ -%include "arm/op_sput.S" {"helper":"MterpSetShortStatic"} +%include "arm/op_sput.S" {"helper":"MterpSPutI16"} diff --git a/runtime/interpreter/mterp/arm/op_sput_wide.S b/runtime/interpreter/mterp/arm/op_sput_wide.S index 1e8fcc9b75..0ed4017ce9 100644 --- a/runtime/interpreter/mterp/arm/op_sput_wide.S +++ b/runtime/interpreter/mterp/arm/op_sput_wide.S @@ -3,7 +3,7 @@ * */ /* sput-wide vAA, field@BBBB */ - .extern MterpSet64Static + .extern MterpSPutU64 EXPORT_PC FETCH r0, 1 @ r0<- field ref BBBB mov r1, rINST, lsr #8 @ r1<- AA @@ -11,7 +11,7 @@ ldr r2, [rFP, #OFF_FP_METHOD] mov r3, rSELF PREFETCH_INST 2 @ Get next inst, but don't advance rPC - bl MterpSet64Static + bl MterpSPutU64 cmp r0, #0 @ 0 on success, -1 on failure bne MterpException ADVANCE 2 @ Past exception point - now advance rPC diff --git a/runtime/interpreter/mterp/arm64/op_iget.S b/runtime/interpreter/mterp/arm64/op_iget.S index d9feac7765..cb453ac524 100644 --- a/runtime/interpreter/mterp/arm64/op_iget.S +++ b/runtime/interpreter/mterp/arm64/op_iget.S @@ -1,4 +1,4 @@ -%default { "extend":"", "is_object":"0", "helper":"artGet32InstanceFromMterp"} +%default { "extend":"", "is_object":"0", "helper":"MterpIGetU32"} /* * General instance field get. * diff --git a/runtime/interpreter/mterp/arm64/op_iget_boolean.S b/runtime/interpreter/mterp/arm64/op_iget_boolean.S index f6ea4dd8b5..3b17144478 100644 --- a/runtime/interpreter/mterp/arm64/op_iget_boolean.S +++ b/runtime/interpreter/mterp/arm64/op_iget_boolean.S @@ -1 +1 @@ -%include "arm64/op_iget.S" { "helper":"artGetBooleanInstanceFromMterp", "extend":"uxtb w0, w0" } +%include "arm64/op_iget.S" { "helper":"MterpIGetU8", "extend":"uxtb w0, w0" } diff --git a/runtime/interpreter/mterp/arm64/op_iget_byte.S b/runtime/interpreter/mterp/arm64/op_iget_byte.S index 497e2bf253..d5ef1d3c2b 100644 --- a/runtime/interpreter/mterp/arm64/op_iget_byte.S +++ b/runtime/interpreter/mterp/arm64/op_iget_byte.S @@ -1 +1 @@ -%include "arm64/op_iget.S" { "helper":"artGetByteInstanceFromMterp", "extend":"sxtb w0, w0" } +%include "arm64/op_iget.S" { "helper":"MterpIGetI8", "extend":"sxtb w0, w0" } diff --git a/runtime/interpreter/mterp/arm64/op_iget_char.S b/runtime/interpreter/mterp/arm64/op_iget_char.S index 4669859121..68e1435201 100644 --- a/runtime/interpreter/mterp/arm64/op_iget_char.S +++ b/runtime/interpreter/mterp/arm64/op_iget_char.S @@ -1 +1 @@ -%include "arm64/op_iget.S" { "helper":"artGetCharInstanceFromMterp", "extend":"uxth w0, w0" } +%include "arm64/op_iget.S" { "helper":"MterpIGetU16", "extend":"uxth w0, w0" } diff --git a/runtime/interpreter/mterp/arm64/op_iget_object.S b/runtime/interpreter/mterp/arm64/op_iget_object.S index eb7bdeaee3..40ddadd971 100644 --- a/runtime/interpreter/mterp/arm64/op_iget_object.S +++ b/runtime/interpreter/mterp/arm64/op_iget_object.S @@ -1 +1 @@ -%include "arm64/op_iget.S" { "is_object":"1", "helper":"artGetObjInstanceFromMterp" } +%include "arm64/op_iget.S" { "is_object":"1", "helper":"MterpIGetObj" } diff --git a/runtime/interpreter/mterp/arm64/op_iget_short.S b/runtime/interpreter/mterp/arm64/op_iget_short.S index 6f0a5055d7..714f4b9aef 100644 --- a/runtime/interpreter/mterp/arm64/op_iget_short.S +++ b/runtime/interpreter/mterp/arm64/op_iget_short.S @@ -1 +1 @@ -%include "arm64/op_iget.S" { "helper":"artGetShortInstanceFromMterp", "extend":"sxth w0, w0" } +%include "arm64/op_iget.S" { "helper":"MterpIGetI16", "extend":"sxth w0, w0" } diff --git a/runtime/interpreter/mterp/arm64/op_iget_wide.S b/runtime/interpreter/mterp/arm64/op_iget_wide.S index 02ef0a71fd..4fc735ce6b 100644 --- a/runtime/interpreter/mterp/arm64/op_iget_wide.S +++ b/runtime/interpreter/mterp/arm64/op_iget_wide.S @@ -9,7 +9,7 @@ GET_VREG w1, w1 // w1<- fp[B], the object pointer ldr x2, [xFP, #OFF_FP_METHOD] // w2<- referrer mov x3, xSELF // w3<- self - bl artGet64InstanceFromMterp + bl MterpIGetU64 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] ubfx w2, wINST, #8, #4 // w2<- A PREFETCH_INST 2 diff --git a/runtime/interpreter/mterp/arm64/op_iput.S b/runtime/interpreter/mterp/arm64/op_iput.S index a8c0e61a8f..5e21d5c6de 100644 --- a/runtime/interpreter/mterp/arm64/op_iput.S +++ b/runtime/interpreter/mterp/arm64/op_iput.S @@ -1,11 +1,11 @@ -%default { "is_object":"0", "handler":"artSet32InstanceFromMterp" } +%default { "is_object":"0", "helper":"MterpIPutU32" } /* * General 32-bit instance field put. * * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field//CCCC */ - .extern $handler + .extern $helper EXPORT_PC FETCH w0, 1 // w0<- field ref CCCC lsr w1, wINST, #12 // w1<- B @@ -14,7 +14,7 @@ GET_VREG w2, w2 // w2<- fp[A] ldr x3, [xFP, #OFF_FP_METHOD] // w3<- referrer PREFETCH_INST 2 - bl $handler + bl $helper cbnz w0, MterpPossibleException ADVANCE 2 // advance rPC GET_INST_OPCODE ip // extract opcode from rINST diff --git a/runtime/interpreter/mterp/arm64/op_iput_boolean.S b/runtime/interpreter/mterp/arm64/op_iput_boolean.S index bbf53192c5..12a278ccba 100644 --- a/runtime/interpreter/mterp/arm64/op_iput_boolean.S +++ b/runtime/interpreter/mterp/arm64/op_iput_boolean.S @@ -1 +1 @@ -%include "arm64/op_iput.S" { "handler":"artSet8InstanceFromMterp" } +%include "arm64/op_iput.S" { "helper":"MterpIPutU8" } diff --git a/runtime/interpreter/mterp/arm64/op_iput_byte.S b/runtime/interpreter/mterp/arm64/op_iput_byte.S index bbf53192c5..82b99e9765 100644 --- a/runtime/interpreter/mterp/arm64/op_iput_byte.S +++ b/runtime/interpreter/mterp/arm64/op_iput_byte.S @@ -1 +1 @@ -%include "arm64/op_iput.S" { "handler":"artSet8InstanceFromMterp" } +%include "arm64/op_iput.S" { "helper":"MterpIPutI8" } diff --git a/runtime/interpreter/mterp/arm64/op_iput_char.S b/runtime/interpreter/mterp/arm64/op_iput_char.S index 150d8794ca..427d92d9c0 100644 --- a/runtime/interpreter/mterp/arm64/op_iput_char.S +++ b/runtime/interpreter/mterp/arm64/op_iput_char.S @@ -1 +1 @@ -%include "arm64/op_iput.S" { "handler":"artSet16InstanceFromMterp" } +%include "arm64/op_iput.S" { "helper":"MterpIPutU16" } diff --git a/runtime/interpreter/mterp/arm64/op_iput_object.S b/runtime/interpreter/mterp/arm64/op_iput_object.S index 37a649be6b..0c0441a3f0 100644 --- a/runtime/interpreter/mterp/arm64/op_iput_object.S +++ b/runtime/interpreter/mterp/arm64/op_iput_object.S @@ -3,7 +3,7 @@ mov x1, xPC mov w2, wINST mov x3, xSELF - bl MterpIputObject + bl MterpIPutObj cbz w0, MterpException FETCH_ADVANCE_INST 2 // advance rPC, load rINST GET_INST_OPCODE ip // extract opcode from rINST diff --git a/runtime/interpreter/mterp/arm64/op_iput_short.S b/runtime/interpreter/mterp/arm64/op_iput_short.S index 150d8794ca..67f1ace8bf 100644 --- a/runtime/interpreter/mterp/arm64/op_iput_short.S +++ b/runtime/interpreter/mterp/arm64/op_iput_short.S @@ -1 +1 @@ -%include "arm64/op_iput.S" { "handler":"artSet16InstanceFromMterp" } +%include "arm64/op_iput.S" { "helper":"MterpIPutI16" } diff --git a/runtime/interpreter/mterp/arm64/op_iput_wide.S b/runtime/interpreter/mterp/arm64/op_iput_wide.S index e1ab1271f5..be6aeb0e3d 100644 --- a/runtime/interpreter/mterp/arm64/op_iput_wide.S +++ b/runtime/interpreter/mterp/arm64/op_iput_wide.S @@ -1,5 +1,5 @@ /* iput-wide vA, vB, field//CCCC */ - .extern artSet64InstanceFromMterp + .extern MterpIPutU64 EXPORT_PC FETCH w0, 1 // w0<- field ref CCCC lsr w1, wINST, #12 // w1<- B @@ -8,7 +8,7 @@ VREG_INDEX_TO_ADDR x2, x2 // w2<- &fp[A] ldr x3, [xFP, #OFF_FP_METHOD] // w3<- referrer PREFETCH_INST 2 - bl artSet64InstanceFromMterp + bl MterpIPutU64 cbnz w0, MterpPossibleException ADVANCE 2 // advance rPC GET_INST_OPCODE ip // extract opcode from wINST diff --git a/runtime/interpreter/mterp/arm64/op_sget.S b/runtime/interpreter/mterp/arm64/op_sget.S index 84e71ac15e..00b07fa484 100644 --- a/runtime/interpreter/mterp/arm64/op_sget.S +++ b/runtime/interpreter/mterp/arm64/op_sget.S @@ -1,4 +1,4 @@ -%default { "is_object":"0", "helper":"MterpGet32Static", "extend":"" } +%default { "is_object":"0", "helper":"MterpSGetU32", "extend":"" } /* * General SGET handler wrapper. * diff --git a/runtime/interpreter/mterp/arm64/op_sget_boolean.S b/runtime/interpreter/mterp/arm64/op_sget_boolean.S index 868f41cb7f..73f3a107f4 100644 --- a/runtime/interpreter/mterp/arm64/op_sget_boolean.S +++ b/runtime/interpreter/mterp/arm64/op_sget_boolean.S @@ -1 +1 @@ -%include "arm64/op_sget.S" {"helper":"MterpGetBooleanStatic", "extend":"uxtb w0, w0"} +%include "arm64/op_sget.S" {"helper":"MterpSGetU8", "extend":"uxtb w0, w0"} diff --git a/runtime/interpreter/mterp/arm64/op_sget_byte.S b/runtime/interpreter/mterp/arm64/op_sget_byte.S index e135aa737a..38c0da614f 100644 --- a/runtime/interpreter/mterp/arm64/op_sget_byte.S +++ b/runtime/interpreter/mterp/arm64/op_sget_byte.S @@ -1 +1 @@ -%include "arm64/op_sget.S" {"helper":"MterpGetByteStatic", "extend":"sxtb w0, w0"} +%include "arm64/op_sget.S" {"helper":"MterpSGetI8", "extend":"sxtb w0, w0"} diff --git a/runtime/interpreter/mterp/arm64/op_sget_char.S b/runtime/interpreter/mterp/arm64/op_sget_char.S index 05d57ac20b..c0801bfa2b 100644 --- a/runtime/interpreter/mterp/arm64/op_sget_char.S +++ b/runtime/interpreter/mterp/arm64/op_sget_char.S @@ -1 +1 @@ -%include "arm64/op_sget.S" {"helper":"MterpGetCharStatic", "extend":"uxth w0, w0"} +%include "arm64/op_sget.S" {"helper":"MterpSGetU16", "extend":"uxth w0, w0"} diff --git a/runtime/interpreter/mterp/arm64/op_sget_object.S b/runtime/interpreter/mterp/arm64/op_sget_object.S index 1faaf6eb8e..69d6adb549 100644 --- a/runtime/interpreter/mterp/arm64/op_sget_object.S +++ b/runtime/interpreter/mterp/arm64/op_sget_object.S @@ -1 +1 @@ -%include "arm64/op_sget.S" {"is_object":"1", "helper":"MterpGetObjStatic"} +%include "arm64/op_sget.S" {"is_object":"1", "helper":"MterpSGetObj"} diff --git a/runtime/interpreter/mterp/arm64/op_sget_short.S b/runtime/interpreter/mterp/arm64/op_sget_short.S index 5900231b06..81e043453e 100644 --- a/runtime/interpreter/mterp/arm64/op_sget_short.S +++ b/runtime/interpreter/mterp/arm64/op_sget_short.S @@ -1 +1 @@ -%include "arm64/op_sget.S" {"helper":"MterpGetShortStatic", "extend":"sxth w0, w0"} +%include "arm64/op_sget.S" {"helper":"MterpSGetI16", "extend":"sxth w0, w0"} diff --git a/runtime/interpreter/mterp/arm64/op_sget_wide.S b/runtime/interpreter/mterp/arm64/op_sget_wide.S index 92f3f7dd66..546ab9482d 100644 --- a/runtime/interpreter/mterp/arm64/op_sget_wide.S +++ b/runtime/interpreter/mterp/arm64/op_sget_wide.S @@ -4,12 +4,12 @@ */ /* sget-wide vAA, field//BBBB */ - .extern MterpGet64StaticFromCode + .extern MterpSGetU64 EXPORT_PC FETCH w0, 1 // w0<- field ref BBBB ldr x1, [xFP, #OFF_FP_METHOD] mov x2, xSELF - bl MterpGet64Static + bl MterpSGetU64 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] lsr w4, wINST, #8 // w4<- AA cbnz x3, MterpException // bail out diff --git a/runtime/interpreter/mterp/arm64/op_sput.S b/runtime/interpreter/mterp/arm64/op_sput.S index e322af0e76..7a0dc30c52 100644 --- a/runtime/interpreter/mterp/arm64/op_sput.S +++ b/runtime/interpreter/mterp/arm64/op_sput.S @@ -1,4 +1,4 @@ -%default { "helper":"MterpSet32Static"} +%default { "helper":"MterpSPutU32"} /* * General SPUT handler wrapper. * diff --git a/runtime/interpreter/mterp/arm64/op_sput_boolean.S b/runtime/interpreter/mterp/arm64/op_sput_boolean.S index 9928f31c98..3d0c7c0262 100644 --- a/runtime/interpreter/mterp/arm64/op_sput_boolean.S +++ b/runtime/interpreter/mterp/arm64/op_sput_boolean.S @@ -1 +1 @@ -%include "arm64/op_sput.S" {"helper":"MterpSetBooleanStatic"} +%include "arm64/op_sput.S" {"helper":"MterpSPutU8"} diff --git a/runtime/interpreter/mterp/arm64/op_sput_byte.S b/runtime/interpreter/mterp/arm64/op_sput_byte.S index 16d6ba96e0..489cf92149 100644 --- a/runtime/interpreter/mterp/arm64/op_sput_byte.S +++ b/runtime/interpreter/mterp/arm64/op_sput_byte.S @@ -1 +1 @@ -%include "arm64/op_sput.S" {"helper":"MterpSetByteStatic"} +%include "arm64/op_sput.S" {"helper":"MterpSPutI8"} diff --git a/runtime/interpreter/mterp/arm64/op_sput_char.S b/runtime/interpreter/mterp/arm64/op_sput_char.S index ab5e8152b9..f79d311c17 100644 --- a/runtime/interpreter/mterp/arm64/op_sput_char.S +++ b/runtime/interpreter/mterp/arm64/op_sput_char.S @@ -1 +1 @@ -%include "arm64/op_sput.S" {"helper":"MterpSetCharStatic"} +%include "arm64/op_sput.S" {"helper":"MterpSPutU16"} diff --git a/runtime/interpreter/mterp/arm64/op_sput_object.S b/runtime/interpreter/mterp/arm64/op_sput_object.S index c176da273f..a64965614b 100644 --- a/runtime/interpreter/mterp/arm64/op_sput_object.S +++ b/runtime/interpreter/mterp/arm64/op_sput_object.S @@ -3,7 +3,7 @@ mov x1, xPC mov x2, xINST mov x3, xSELF - bl MterpSputObject + bl MterpSPutObj cbz w0, MterpException FETCH_ADVANCE_INST 2 // advance rPC, load rINST GET_INST_OPCODE ip // extract opcode from rINST diff --git a/runtime/interpreter/mterp/arm64/op_sput_short.S b/runtime/interpreter/mterp/arm64/op_sput_short.S index b54f88ad48..06482cd7a0 100644 --- a/runtime/interpreter/mterp/arm64/op_sput_short.S +++ b/runtime/interpreter/mterp/arm64/op_sput_short.S @@ -1 +1 @@ -%include "arm64/op_sput.S" {"helper":"MterpSetShortStatic"} +%include "arm64/op_sput.S" {"helper":"MterpSPutI16"} diff --git a/runtime/interpreter/mterp/arm64/op_sput_wide.S b/runtime/interpreter/mterp/arm64/op_sput_wide.S index 4aeb8ff316..58b3c42333 100644 --- a/runtime/interpreter/mterp/arm64/op_sput_wide.S +++ b/runtime/interpreter/mterp/arm64/op_sput_wide.S @@ -3,7 +3,7 @@ * */ /* sput-wide vAA, field//BBBB */ - .extern MterpSet64Static + .extern MterpSPutU64 EXPORT_PC FETCH w0, 1 // w0<- field ref BBBB lsr w1, wINST, #8 // w1<- AA @@ -11,7 +11,7 @@ ldr x2, [xFP, #OFF_FP_METHOD] mov x3, xSELF PREFETCH_INST 2 // Get next inst, but don't advance rPC - bl MterpSet64Static + bl MterpSPutU64 cbnz w0, MterpException // 0 on success, -1 on failure ADVANCE 2 // Past exception point - now advance rPC GET_INST_OPCODE ip // extract opcode from wINST diff --git a/runtime/interpreter/mterp/mips/op_iget.S b/runtime/interpreter/mterp/mips/op_iget.S index 0785ac5e32..33717de640 100644 --- a/runtime/interpreter/mterp/mips/op_iget.S +++ b/runtime/interpreter/mterp/mips/op_iget.S @@ -1,4 +1,4 @@ -%default { "is_object":"0", "helper":"artGet32InstanceFromMterp"} +%default { "is_object":"0", "helper":"MterpIGetU32"} /* * General instance field get. * diff --git a/runtime/interpreter/mterp/mips/op_iget_boolean.S b/runtime/interpreter/mterp/mips/op_iget_boolean.S index a932c37a82..f2ef68d8b2 100644 --- a/runtime/interpreter/mterp/mips/op_iget_boolean.S +++ b/runtime/interpreter/mterp/mips/op_iget_boolean.S @@ -1 +1 @@ -%include "mips/op_iget.S" { "helper":"artGetBooleanInstanceFromMterp" } +%include "mips/op_iget.S" { "helper":"MterpIGetU8" } diff --git a/runtime/interpreter/mterp/mips/op_iget_byte.S b/runtime/interpreter/mterp/mips/op_iget_byte.S index e498a8c774..0c8fb7cf2c 100644 --- a/runtime/interpreter/mterp/mips/op_iget_byte.S +++ b/runtime/interpreter/mterp/mips/op_iget_byte.S @@ -1 +1 @@ -%include "mips/op_iget.S" { "helper":"artGetByteInstanceFromMterp" } +%include "mips/op_iget.S" { "helper":"MterpIGetI8" } diff --git a/runtime/interpreter/mterp/mips/op_iget_char.S b/runtime/interpreter/mterp/mips/op_iget_char.S index efd5b99372..69d04c4fa8 100644 --- a/runtime/interpreter/mterp/mips/op_iget_char.S +++ b/runtime/interpreter/mterp/mips/op_iget_char.S @@ -1 +1 @@ -%include "mips/op_iget.S" { "helper":"artGetCharInstanceFromMterp" } +%include "mips/op_iget.S" { "helper":"MterpIGetU16" } diff --git a/runtime/interpreter/mterp/mips/op_iget_object.S b/runtime/interpreter/mterp/mips/op_iget_object.S index 8fa96521f6..bea330a14b 100644 --- a/runtime/interpreter/mterp/mips/op_iget_object.S +++ b/runtime/interpreter/mterp/mips/op_iget_object.S @@ -1 +1 @@ -%include "mips/op_iget.S" { "is_object":"1", "helper":"artGetObjInstanceFromMterp" } +%include "mips/op_iget.S" { "is_object":"1", "helper":"MterpIGetObj" } diff --git a/runtime/interpreter/mterp/mips/op_iget_short.S b/runtime/interpreter/mterp/mips/op_iget_short.S index efc5de4890..357c7918e4 100644 --- a/runtime/interpreter/mterp/mips/op_iget_short.S +++ b/runtime/interpreter/mterp/mips/op_iget_short.S @@ -1 +1 @@ -%include "mips/op_iget.S" { "helper":"artGetShortInstanceFromMterp" } +%include "mips/op_iget.S" { "helper":"MterpIGetI16" } diff --git a/runtime/interpreter/mterp/mips/op_iget_wide.S b/runtime/interpreter/mterp/mips/op_iget_wide.S index e1d83a48f5..858a8898f4 100644 --- a/runtime/interpreter/mterp/mips/op_iget_wide.S +++ b/runtime/interpreter/mterp/mips/op_iget_wide.S @@ -10,7 +10,7 @@ GET_VREG(a1, a1) # a1 <- fp[B], the object pointer lw a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - JAL(artGet64InstanceFromMterp) + JAL(MterpIGetU64) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA4(a2) # a2<- A+ PREFETCH_INST(2) # load rINST diff --git a/runtime/interpreter/mterp/mips/op_iput.S b/runtime/interpreter/mterp/mips/op_iput.S index 9133d60ed8..4dd4075e92 100644 --- a/runtime/interpreter/mterp/mips/op_iput.S +++ b/runtime/interpreter/mterp/mips/op_iput.S @@ -1,11 +1,11 @@ -%default { "handler":"artSet32InstanceFromMterp" } +%default { "helper":"MterpIPutU32" } /* * General 32-bit instance field put. * * for: iput, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern $handler + .extern $helper EXPORT_PC() FETCH(a0, 1) # a0 <- field ref CCCC GET_OPB(a1) # a1 <- B @@ -14,7 +14,7 @@ GET_VREG(a2, a2) # a2 <- fp[A] lw a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST(2) # load rINST - JAL($handler) + JAL($helper) bnez v0, MterpPossibleException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST diff --git a/runtime/interpreter/mterp/mips/op_iput_boolean.S b/runtime/interpreter/mterp/mips/op_iput_boolean.S index da28c978a4..55ac4cedaa 100644 --- a/runtime/interpreter/mterp/mips/op_iput_boolean.S +++ b/runtime/interpreter/mterp/mips/op_iput_boolean.S @@ -1 +1 @@ -%include "mips/op_iput.S" { "handler":"artSet8InstanceFromMterp" } +%include "mips/op_iput.S" { "helper":"MterpIPutU8" } diff --git a/runtime/interpreter/mterp/mips/op_iput_byte.S b/runtime/interpreter/mterp/mips/op_iput_byte.S index da28c978a4..61e489be11 100644 --- a/runtime/interpreter/mterp/mips/op_iput_byte.S +++ b/runtime/interpreter/mterp/mips/op_iput_byte.S @@ -1 +1 @@ -%include "mips/op_iput.S" { "handler":"artSet8InstanceFromMterp" } +%include "mips/op_iput.S" { "helper":"MterpIPutI8" } diff --git a/runtime/interpreter/mterp/mips/op_iput_char.S b/runtime/interpreter/mterp/mips/op_iput_char.S index 389b0bf19b..2caad1e0a6 100644 --- a/runtime/interpreter/mterp/mips/op_iput_char.S +++ b/runtime/interpreter/mterp/mips/op_iput_char.S @@ -1 +1 @@ -%include "mips/op_iput.S" { "handler":"artSet16InstanceFromMterp" } +%include "mips/op_iput.S" { "helper":"MterpIPutU16" } diff --git a/runtime/interpreter/mterp/mips/op_iput_object.S b/runtime/interpreter/mterp/mips/op_iput_object.S index cfa56ec657..c96a4d4ec7 100644 --- a/runtime/interpreter/mterp/mips/op_iput_object.S +++ b/runtime/interpreter/mterp/mips/op_iput_object.S @@ -9,7 +9,7 @@ move a1, rPC move a2, rINST move a3, rSELF - JAL(MterpIputObject) + JAL(MterpIPutObj) beqz v0, MterpException FETCH_ADVANCE_INST(2) # advance rPC, load rINST GET_INST_OPCODE(t0) # extract opcode from rINST diff --git a/runtime/interpreter/mterp/mips/op_iput_short.S b/runtime/interpreter/mterp/mips/op_iput_short.S index 389b0bf19b..414a15bd70 100644 --- a/runtime/interpreter/mterp/mips/op_iput_short.S +++ b/runtime/interpreter/mterp/mips/op_iput_short.S @@ -1 +1 @@ -%include "mips/op_iput.S" { "handler":"artSet16InstanceFromMterp" } +%include "mips/op_iput.S" { "helper":"MterpIPutI16" } diff --git a/runtime/interpreter/mterp/mips/op_iput_wide.S b/runtime/interpreter/mterp/mips/op_iput_wide.S index bc3d758c5e..dccb6b71b1 100644 --- a/runtime/interpreter/mterp/mips/op_iput_wide.S +++ b/runtime/interpreter/mterp/mips/op_iput_wide.S @@ -1,5 +1,5 @@ /* iput-wide vA, vB, field@CCCC */ - .extern artSet64InstanceFromMterp + .extern MterpIPutU64 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref CCCC GET_OPB(a1) # a1 <- B @@ -8,7 +8,7 @@ EAS2(a2, rFP, a2) # a2 <- &fp[A] lw a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST(2) # load rINST - JAL(artSet64InstanceFromMterp) + JAL(MterpIPutU64) bnez v0, MterpPossibleException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST diff --git a/runtime/interpreter/mterp/mips/op_sget.S b/runtime/interpreter/mterp/mips/op_sget.S index 635df8aa1f..8750a17a41 100644 --- a/runtime/interpreter/mterp/mips/op_sget.S +++ b/runtime/interpreter/mterp/mips/op_sget.S @@ -1,4 +1,4 @@ -%default { "is_object":"0", "helper":"MterpGet32Static" } +%default { "is_object":"0", "helper":"MterpSGetU32" } /* * General SGET handler. * diff --git a/runtime/interpreter/mterp/mips/op_sget_boolean.S b/runtime/interpreter/mterp/mips/op_sget_boolean.S index 7829970d84..7a7012e81f 100644 --- a/runtime/interpreter/mterp/mips/op_sget_boolean.S +++ b/runtime/interpreter/mterp/mips/op_sget_boolean.S @@ -1 +1 @@ -%include "mips/op_sget.S" {"helper":"MterpGetBooleanStatic"} +%include "mips/op_sget.S" {"helper":"MterpSGetU8"} diff --git a/runtime/interpreter/mterp/mips/op_sget_byte.S b/runtime/interpreter/mterp/mips/op_sget_byte.S index ee0834201b..a2f1dbf606 100644 --- a/runtime/interpreter/mterp/mips/op_sget_byte.S +++ b/runtime/interpreter/mterp/mips/op_sget_byte.S @@ -1 +1 @@ -%include "mips/op_sget.S" {"helper":"MterpGetByteStatic"} +%include "mips/op_sget.S" {"helper":"MterpSGetI8"} diff --git a/runtime/interpreter/mterp/mips/op_sget_char.S b/runtime/interpreter/mterp/mips/op_sget_char.S index d8b477a7bc..07d40416a3 100644 --- a/runtime/interpreter/mterp/mips/op_sget_char.S +++ b/runtime/interpreter/mterp/mips/op_sget_char.S @@ -1 +1 @@ -%include "mips/op_sget.S" {"helper":"MterpGetCharStatic"} +%include "mips/op_sget.S" {"helper":"MterpSGetU16"} diff --git a/runtime/interpreter/mterp/mips/op_sget_object.S b/runtime/interpreter/mterp/mips/op_sget_object.S index 2dc00c386c..0a3c9eef88 100644 --- a/runtime/interpreter/mterp/mips/op_sget_object.S +++ b/runtime/interpreter/mterp/mips/op_sget_object.S @@ -1 +1 @@ -%include "mips/op_sget.S" {"is_object":"1", "helper":"MterpGetObjStatic"} +%include "mips/op_sget.S" {"is_object":"1", "helper":"MterpSGetObj"} diff --git a/runtime/interpreter/mterp/mips/op_sget_short.S b/runtime/interpreter/mterp/mips/op_sget_short.S index ab55d93060..29604430f2 100644 --- a/runtime/interpreter/mterp/mips/op_sget_short.S +++ b/runtime/interpreter/mterp/mips/op_sget_short.S @@ -1 +1 @@ -%include "mips/op_sget.S" {"helper":"MterpGetShortStatic"} +%include "mips/op_sget.S" {"helper":"MterpSGetI16"} diff --git a/runtime/interpreter/mterp/mips/op_sget_wide.S b/runtime/interpreter/mterp/mips/op_sget_wide.S index ec4295ad03..76f78cb35d 100644 --- a/runtime/interpreter/mterp/mips/op_sget_wide.S +++ b/runtime/interpreter/mterp/mips/op_sget_wide.S @@ -2,12 +2,12 @@ * 64-bit SGET handler. */ /* sget-wide vAA, field@BBBB */ - .extern MterpGet64Static + .extern MterpSGetU64 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref BBBB lw a1, OFF_FP_METHOD(rFP) # a1 <- method move a2, rSELF # a2 <- self - JAL(MterpGet64Static) + JAL(MterpSGetU64) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) bnez a3, MterpException GET_OPA(a1) # a1 <- AA diff --git a/runtime/interpreter/mterp/mips/op_sput.S b/runtime/interpreter/mterp/mips/op_sput.S index 37f8687aaa..547de3964a 100644 --- a/runtime/interpreter/mterp/mips/op_sput.S +++ b/runtime/interpreter/mterp/mips/op_sput.S @@ -1,4 +1,4 @@ -%default { "helper":"MterpSet32Static"} +%default { "helper":"MterpSPutU32"} /* * General SPUT handler. * diff --git a/runtime/interpreter/mterp/mips/op_sput_boolean.S b/runtime/interpreter/mterp/mips/op_sput_boolean.S index 6426cd40eb..0137430acc 100644 --- a/runtime/interpreter/mterp/mips/op_sput_boolean.S +++ b/runtime/interpreter/mterp/mips/op_sput_boolean.S @@ -1 +1 @@ -%include "mips/op_sput.S" {"helper":"MterpSetBooleanStatic"} +%include "mips/op_sput.S" {"helper":"MterpSPutU8"} diff --git a/runtime/interpreter/mterp/mips/op_sput_byte.S b/runtime/interpreter/mterp/mips/op_sput_byte.S index c68d18f2f7..5ae4256a98 100644 --- a/runtime/interpreter/mterp/mips/op_sput_byte.S +++ b/runtime/interpreter/mterp/mips/op_sput_byte.S @@ -1 +1 @@ -%include "mips/op_sput.S" {"helper":"MterpSetByteStatic"} +%include "mips/op_sput.S" {"helper":"MterpSPutI8"} diff --git a/runtime/interpreter/mterp/mips/op_sput_char.S b/runtime/interpreter/mterp/mips/op_sput_char.S index 9b8983e4c6..83787a7753 100644 --- a/runtime/interpreter/mterp/mips/op_sput_char.S +++ b/runtime/interpreter/mterp/mips/op_sput_char.S @@ -1 +1 @@ -%include "mips/op_sput.S" {"helper":"MterpSetCharStatic"} +%include "mips/op_sput.S" {"helper":"MterpSPutU16"} diff --git a/runtime/interpreter/mterp/mips/op_sput_object.S b/runtime/interpreter/mterp/mips/op_sput_object.S index 4f9034ec0e..55c88a6816 100644 --- a/runtime/interpreter/mterp/mips/op_sput_object.S +++ b/runtime/interpreter/mterp/mips/op_sput_object.S @@ -9,7 +9,7 @@ move a1, rPC move a2, rINST move a3, rSELF - JAL(MterpSputObject) + JAL(MterpSPutObj) beqz v0, MterpException FETCH_ADVANCE_INST(2) # advance rPC, load rINST GET_INST_OPCODE(t0) # extract opcode from rINST diff --git a/runtime/interpreter/mterp/mips/op_sput_short.S b/runtime/interpreter/mterp/mips/op_sput_short.S index 5a57ed9922..df99b4414d 100644 --- a/runtime/interpreter/mterp/mips/op_sput_short.S +++ b/runtime/interpreter/mterp/mips/op_sput_short.S @@ -1 +1 @@ -%include "mips/op_sput.S" {"helper":"MterpSetShortStatic"} +%include "mips/op_sput.S" {"helper":"MterpSPutI16"} diff --git a/runtime/interpreter/mterp/mips/op_sput_wide.S b/runtime/interpreter/mterp/mips/op_sput_wide.S index c090007968..cfaaaee6f3 100644 --- a/runtime/interpreter/mterp/mips/op_sput_wide.S +++ b/runtime/interpreter/mterp/mips/op_sput_wide.S @@ -2,7 +2,7 @@ * 64-bit SPUT handler. */ /* sput-wide vAA, field@BBBB */ - .extern MterpSet64Static + .extern MterpSPutU64 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref CCCC GET_OPA(a1) # a1 <- AA @@ -10,7 +10,7 @@ lw a2, OFF_FP_METHOD(rFP) # a2 <- method move a3, rSELF # a3 <- self PREFETCH_INST(2) # load rINST - JAL(MterpSet64Static) + JAL(MterpSPutU64) bnez v0, MterpException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST diff --git a/runtime/interpreter/mterp/mips64/op_iget.S b/runtime/interpreter/mterp/mips64/op_iget.S index 4158603e4a..a8ce94c3ba 100644 --- a/runtime/interpreter/mterp/mips64/op_iget.S +++ b/runtime/interpreter/mterp/mips64/op_iget.S @@ -1,4 +1,4 @@ -%default { "is_object":"0", "helper":"artGet32InstanceFromMterp"} +%default { "is_object":"0", "helper":"MterpIGetU32"} /* * General instance field get. * diff --git a/runtime/interpreter/mterp/mips64/op_iget_boolean.S b/runtime/interpreter/mterp/mips64/op_iget_boolean.S index e64b7982f8..dc2a42ad76 100644 --- a/runtime/interpreter/mterp/mips64/op_iget_boolean.S +++ b/runtime/interpreter/mterp/mips64/op_iget_boolean.S @@ -1 +1 @@ -%include "mips64/op_iget.S" { "helper":"artGetBooleanInstanceFromMterp" } +%include "mips64/op_iget.S" { "helper":"MterpIGetU8" } diff --git a/runtime/interpreter/mterp/mips64/op_iget_byte.S b/runtime/interpreter/mterp/mips64/op_iget_byte.S index fefe53f308..c5bf6506e6 100644 --- a/runtime/interpreter/mterp/mips64/op_iget_byte.S +++ b/runtime/interpreter/mterp/mips64/op_iget_byte.S @@ -1 +1 @@ -%include "mips64/op_iget.S" { "helper":"artGetByteInstanceFromMterp" } +%include "mips64/op_iget.S" { "helper":"MterpIGetI8" } diff --git a/runtime/interpreter/mterp/mips64/op_iget_char.S b/runtime/interpreter/mterp/mips64/op_iget_char.S index 9caf40ecff..3bf0c5aab9 100644 --- a/runtime/interpreter/mterp/mips64/op_iget_char.S +++ b/runtime/interpreter/mterp/mips64/op_iget_char.S @@ -1 +1 @@ -%include "mips64/op_iget.S" { "helper":"artGetCharInstanceFromMterp" } +%include "mips64/op_iget.S" { "helper":"MterpIGetU16" } diff --git a/runtime/interpreter/mterp/mips64/op_iget_object.S b/runtime/interpreter/mterp/mips64/op_iget_object.S index ce3421a94f..23fa187192 100644 --- a/runtime/interpreter/mterp/mips64/op_iget_object.S +++ b/runtime/interpreter/mterp/mips64/op_iget_object.S @@ -1 +1 @@ -%include "mips64/op_iget.S" { "is_object":"1", "helper":"artGetObjInstanceFromMterp" } +%include "mips64/op_iget.S" { "is_object":"1", "helper":"MterpIGetObj" } diff --git a/runtime/interpreter/mterp/mips64/op_iget_short.S b/runtime/interpreter/mterp/mips64/op_iget_short.S index e2d122d2af..a9927fc982 100644 --- a/runtime/interpreter/mterp/mips64/op_iget_short.S +++ b/runtime/interpreter/mterp/mips64/op_iget_short.S @@ -1 +1 @@ -%include "mips64/op_iget.S" { "helper":"artGetShortInstanceFromMterp" } +%include "mips64/op_iget.S" { "helper":"MterpIGetI16" } diff --git a/runtime/interpreter/mterp/mips64/op_iget_wide.S b/runtime/interpreter/mterp/mips64/op_iget_wide.S index ca793e0a27..08bf544265 100644 --- a/runtime/interpreter/mterp/mips64/op_iget_wide.S +++ b/runtime/interpreter/mterp/mips64/op_iget_wide.S @@ -3,14 +3,14 @@ * * for: iget-wide */ - .extern artGet64InstanceFromMterp + .extern MterpIGetU64 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B GET_VREG_U a1, a1 # a1 <- fp[B], the object pointer ld a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - jal artGet64InstanceFromMterp + jal MterpIGetU64 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) ext a2, rINST, 8, 4 # a2 <- A PREFETCH_INST 2 diff --git a/runtime/interpreter/mterp/mips64/op_iput.S b/runtime/interpreter/mterp/mips64/op_iput.S index a906a0fc82..9a789e612d 100644 --- a/runtime/interpreter/mterp/mips64/op_iput.S +++ b/runtime/interpreter/mterp/mips64/op_iput.S @@ -1,4 +1,4 @@ -%default { "helper":"artSet32InstanceFromMterp" } +%default { "helper":"MterpIPutU32" } /* * General 32-bit instance field put. * diff --git a/runtime/interpreter/mterp/mips64/op_iput_boolean.S b/runtime/interpreter/mterp/mips64/op_iput_boolean.S index 3034fa59d5..8e1d083759 100644 --- a/runtime/interpreter/mterp/mips64/op_iput_boolean.S +++ b/runtime/interpreter/mterp/mips64/op_iput_boolean.S @@ -1 +1 @@ -%include "mips64/op_iput.S" { "helper":"artSet8InstanceFromMterp" } +%include "mips64/op_iput.S" { "helper":"MterpIPutU8" } diff --git a/runtime/interpreter/mterp/mips64/op_iput_byte.S b/runtime/interpreter/mterp/mips64/op_iput_byte.S index 3034fa59d5..ce3b614b0c 100644 --- a/runtime/interpreter/mterp/mips64/op_iput_byte.S +++ b/runtime/interpreter/mterp/mips64/op_iput_byte.S @@ -1 +1 @@ -%include "mips64/op_iput.S" { "helper":"artSet8InstanceFromMterp" } +%include "mips64/op_iput.S" { "helper":"MterpIPutI8" } diff --git a/runtime/interpreter/mterp/mips64/op_iput_char.S b/runtime/interpreter/mterp/mips64/op_iput_char.S index 4c2fa28776..1d587fad6b 100644 --- a/runtime/interpreter/mterp/mips64/op_iput_char.S +++ b/runtime/interpreter/mterp/mips64/op_iput_char.S @@ -1 +1 @@ -%include "mips64/op_iput.S" { "helper":"artSet16InstanceFromMterp" } +%include "mips64/op_iput.S" { "helper":"MterpIPutU16" } diff --git a/runtime/interpreter/mterp/mips64/op_iput_object.S b/runtime/interpreter/mterp/mips64/op_iput_object.S index 9a42f54669..dd1938ec63 100644 --- a/runtime/interpreter/mterp/mips64/op_iput_object.S +++ b/runtime/interpreter/mterp/mips64/op_iput_object.S @@ -1,10 +1,10 @@ - .extern MterpIputObject + .extern MterpIPutObj EXPORT_PC daddu a0, rFP, OFF_FP_SHADOWFRAME move a1, rPC move a2, rINST move a3, rSELF - jal MterpIputObject + jal MterpIPutObj beqzc v0, MterpException FETCH_ADVANCE_INST 2 # advance rPC, load rINST GET_INST_OPCODE v0 # extract opcode from rINST diff --git a/runtime/interpreter/mterp/mips64/op_iput_short.S b/runtime/interpreter/mterp/mips64/op_iput_short.S index 4c2fa28776..dd68bbeaaa 100644 --- a/runtime/interpreter/mterp/mips64/op_iput_short.S +++ b/runtime/interpreter/mterp/mips64/op_iput_short.S @@ -1 +1 @@ -%include "mips64/op_iput.S" { "helper":"artSet16InstanceFromMterp" } +%include "mips64/op_iput.S" { "helper":"MterpIPutI16" } diff --git a/runtime/interpreter/mterp/mips64/op_iput_wide.S b/runtime/interpreter/mterp/mips64/op_iput_wide.S index 9b790f812a..62726908fb 100644 --- a/runtime/interpreter/mterp/mips64/op_iput_wide.S +++ b/runtime/interpreter/mterp/mips64/op_iput_wide.S @@ -1,5 +1,5 @@ /* iput-wide vA, vB, field//CCCC */ - .extern artSet64InstanceFromMterp + .extern MterpIPutU64 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B @@ -8,7 +8,7 @@ dlsa a2, a2, rFP, 2 # a2 <- &fp[A] ld a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST 2 - jal artSet64InstanceFromMterp + jal MterpIPutU64 bnez v0, MterpPossibleException # bail out ADVANCE 2 GET_INST_OPCODE v0 # extract opcode from rINST diff --git a/runtime/interpreter/mterp/mips64/op_sget.S b/runtime/interpreter/mterp/mips64/op_sget.S index 71046dba1a..b7b0382b1c 100644 --- a/runtime/interpreter/mterp/mips64/op_sget.S +++ b/runtime/interpreter/mterp/mips64/op_sget.S @@ -1,4 +1,4 @@ -%default { "is_object":"0", "helper":"MterpGet32Static", "extend":"" } +%default { "is_object":"0", "helper":"MterpSGetU32", "extend":"" } /* * General SGET handler wrapper. * diff --git a/runtime/interpreter/mterp/mips64/op_sget_boolean.S b/runtime/interpreter/mterp/mips64/op_sget_boolean.S index ec1ce9eb14..fe2deb1479 100644 --- a/runtime/interpreter/mterp/mips64/op_sget_boolean.S +++ b/runtime/interpreter/mterp/mips64/op_sget_boolean.S @@ -1 +1 @@ -%include "mips64/op_sget.S" {"helper":"MterpGetBooleanStatic", "extend":"and v0, v0, 0xff"} +%include "mips64/op_sget.S" {"helper":"MterpSGetU8", "extend":"and v0, v0, 0xff"} diff --git a/runtime/interpreter/mterp/mips64/op_sget_byte.S b/runtime/interpreter/mterp/mips64/op_sget_byte.S index 6a802f63ea..a7e2bef4bc 100644 --- a/runtime/interpreter/mterp/mips64/op_sget_byte.S +++ b/runtime/interpreter/mterp/mips64/op_sget_byte.S @@ -1 +1 @@ -%include "mips64/op_sget.S" {"helper":"MterpGetByteStatic", "extend":"seb v0, v0"} +%include "mips64/op_sget.S" {"helper":"MterpSGetI8", "extend":"seb v0, v0"} diff --git a/runtime/interpreter/mterp/mips64/op_sget_char.S b/runtime/interpreter/mterp/mips64/op_sget_char.S index 483d085719..ed86f32588 100644 --- a/runtime/interpreter/mterp/mips64/op_sget_char.S +++ b/runtime/interpreter/mterp/mips64/op_sget_char.S @@ -1 +1 @@ -%include "mips64/op_sget.S" {"helper":"MterpGetCharStatic", "extend":"and v0, v0, 0xffff"} +%include "mips64/op_sget.S" {"helper":"MterpSGetU16", "extend":"and v0, v0, 0xffff"} diff --git a/runtime/interpreter/mterp/mips64/op_sget_object.S b/runtime/interpreter/mterp/mips64/op_sget_object.S index 2250696a97..3b260e6ee2 100644 --- a/runtime/interpreter/mterp/mips64/op_sget_object.S +++ b/runtime/interpreter/mterp/mips64/op_sget_object.S @@ -1 +1 @@ -%include "mips64/op_sget.S" {"is_object":"1", "helper":"MterpGetObjStatic"} +%include "mips64/op_sget.S" {"is_object":"1", "helper":"MterpSGetObj"} diff --git a/runtime/interpreter/mterp/mips64/op_sget_short.S b/runtime/interpreter/mterp/mips64/op_sget_short.S index b257bbbba1..f708a201ce 100644 --- a/runtime/interpreter/mterp/mips64/op_sget_short.S +++ b/runtime/interpreter/mterp/mips64/op_sget_short.S @@ -1 +1 @@ -%include "mips64/op_sget.S" {"helper":"MterpGetShortStatic", "extend":"seh v0, v0"} +%include "mips64/op_sget.S" {"helper":"MterpSGetI16", "extend":"seh v0, v0"} diff --git a/runtime/interpreter/mterp/mips64/op_sget_wide.S b/runtime/interpreter/mterp/mips64/op_sget_wide.S index ace64f8e80..7c31252aed 100644 --- a/runtime/interpreter/mterp/mips64/op_sget_wide.S +++ b/runtime/interpreter/mterp/mips64/op_sget_wide.S @@ -3,12 +3,12 @@ * */ /* sget-wide vAA, field//BBBB */ - .extern MterpGet64Static + .extern MterpSGetU64 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB ld a1, OFF_FP_METHOD(rFP) move a2, rSELF - jal MterpGet64Static + jal MterpSGetU64 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) srl a4, rINST, 8 # a4 <- AA bnez a3, MterpException # bail out diff --git a/runtime/interpreter/mterp/mips64/op_sput.S b/runtime/interpreter/mterp/mips64/op_sput.S index 466f3339c2..28b8c3ea26 100644 --- a/runtime/interpreter/mterp/mips64/op_sput.S +++ b/runtime/interpreter/mterp/mips64/op_sput.S @@ -1,4 +1,4 @@ -%default { "helper":"MterpSet32Static" } +%default { "helper":"MterpSPutU32" } /* * General SPUT handler wrapper. * diff --git a/runtime/interpreter/mterp/mips64/op_sput_boolean.S b/runtime/interpreter/mterp/mips64/op_sput_boolean.S index eba58f7fa1..2e769d5e1a 100644 --- a/runtime/interpreter/mterp/mips64/op_sput_boolean.S +++ b/runtime/interpreter/mterp/mips64/op_sput_boolean.S @@ -1 +1 @@ -%include "mips64/op_sput.S" {"helper":"MterpSetBooleanStatic"} +%include "mips64/op_sput.S" {"helper":"MterpSPutU8"} diff --git a/runtime/interpreter/mterp/mips64/op_sput_byte.S b/runtime/interpreter/mterp/mips64/op_sput_byte.S index 80a26c0161..0b04b590ee 100644 --- a/runtime/interpreter/mterp/mips64/op_sput_byte.S +++ b/runtime/interpreter/mterp/mips64/op_sput_byte.S @@ -1 +1 @@ -%include "mips64/op_sput.S" {"helper":"MterpSetByteStatic"} +%include "mips64/op_sput.S" {"helper":"MterpSPutI8"} diff --git a/runtime/interpreter/mterp/mips64/op_sput_char.S b/runtime/interpreter/mterp/mips64/op_sput_char.S index c0d5bf3bba..4a80375d65 100644 --- a/runtime/interpreter/mterp/mips64/op_sput_char.S +++ b/runtime/interpreter/mterp/mips64/op_sput_char.S @@ -1 +1 @@ -%include "mips64/op_sput.S" {"helper":"MterpSetCharStatic"} +%include "mips64/op_sput.S" {"helper":"MterpSPutU16"} diff --git a/runtime/interpreter/mterp/mips64/op_sput_object.S b/runtime/interpreter/mterp/mips64/op_sput_object.S index ef4c685116..ff43967666 100644 --- a/runtime/interpreter/mterp/mips64/op_sput_object.S +++ b/runtime/interpreter/mterp/mips64/op_sput_object.S @@ -1,10 +1,10 @@ - .extern MterpSputObject + .extern MterpSPutObj EXPORT_PC daddu a0, rFP, OFF_FP_SHADOWFRAME move a1, rPC move a2, rINST move a3, rSELF - jal MterpSputObject + jal MterpSPutObj beqzc v0, MterpException FETCH_ADVANCE_INST 2 # advance rPC, load rINST GET_INST_OPCODE v0 # extract opcode from rINST diff --git a/runtime/interpreter/mterp/mips64/op_sput_short.S b/runtime/interpreter/mterp/mips64/op_sput_short.S index b001832bc4..c00043b6b7 100644 --- a/runtime/interpreter/mterp/mips64/op_sput_short.S +++ b/runtime/interpreter/mterp/mips64/op_sput_short.S @@ -1 +1 @@ -%include "mips64/op_sput.S" {"helper":"MterpSetShortStatic"} +%include "mips64/op_sput.S" {"helper":"MterpSPutI16"} diff --git a/runtime/interpreter/mterp/mips64/op_sput_wide.S b/runtime/interpreter/mterp/mips64/op_sput_wide.S index aa3d5b4157..bfb6983bb4 100644 --- a/runtime/interpreter/mterp/mips64/op_sput_wide.S +++ b/runtime/interpreter/mterp/mips64/op_sput_wide.S @@ -3,7 +3,7 @@ * */ /* sput-wide vAA, field//BBBB */ - .extern MterpSet64Static + .extern MterpSPutU64 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB srl a1, rINST, 8 # a2 <- AA @@ -11,7 +11,7 @@ ld a2, OFF_FP_METHOD(rFP) move a3, rSELF PREFETCH_INST 2 # Get next inst, but don't advance rPC - jal MterpSet64Static + jal MterpSPutU64 bnezc v0, MterpException # 0 on success, -1 on failure ADVANCE 2 # Past exception point - now advance rPC GET_INST_OPCODE v0 # extract opcode from rINST diff --git a/runtime/interpreter/mterp/mterp.cc b/runtime/interpreter/mterp/mterp.cc index e0a48740dc..7b37c9aaef 100644 --- a/runtime/interpreter/mterp/mterp.cc +++ b/runtime/interpreter/mterp/mterp.cc @@ -490,7 +490,7 @@ extern "C" size_t MterpNewInstance(ShadowFrame* shadow_frame, Thread* self, uint return true; } -extern "C" size_t MterpSputObject(ShadowFrame* shadow_frame, uint16_t* dex_pc_ptr, +extern "C" size_t MterpSPutObj(ShadowFrame* shadow_frame, uint16_t* dex_pc_ptr, uint32_t inst_data, Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { const Instruction* inst = Instruction::At(dex_pc_ptr); @@ -498,7 +498,7 @@ extern "C" size_t MterpSputObject(ShadowFrame* shadow_frame, uint16_t* dex_pc_pt (self, *shadow_frame, inst, inst_data); } -extern "C" size_t MterpIputObject(ShadowFrame* shadow_frame, +extern "C" size_t MterpIPutObj(ShadowFrame* shadow_frame, uint16_t* dex_pc_ptr, uint32_t inst_data, Thread* self) @@ -734,11 +734,11 @@ ALWAYS_INLINE RetType artGetInstanceFromMterpFast(uint32_t field_idx, return artGetInstanceFromMterp<PrimType, RetType, Getter, kType>(field_idx, obj, referrer, self); } -#define ART_GET_FIELD_FROM_MTERP(Kind, PrimType, RetType, Ptr) \ -extern "C" RetType artGet ## Kind ## InstanceFromMterp(uint32_t field_idx, \ - mirror::Object* obj, \ - ArtMethod* referrer, \ - Thread* self) \ +#define ART_GET_FIELD_FROM_MTERP(Suffix, Kind, PrimType, RetType, Ptr) \ +extern "C" RetType MterpIGet ## Suffix(uint32_t field_idx, \ + mirror::Object* obj, \ + ArtMethod* referrer, \ + Thread* self) \ REQUIRES_SHARED(Locks::mutator_lock_) { \ struct Getter { /* Specialize the field load depending on the field type */ \ static RetType Get(mirror::Object* o, ArtField* f) REQUIRES_SHARED(Locks::mutator_lock_) { \ @@ -748,58 +748,72 @@ extern "C" RetType artGet ## Kind ## InstanceFromMterp(uint32_t field_idx, return artGetInstanceFromMterpFast<PrimType, RetType, Getter>(field_idx, obj, referrer, self); \ } \ -ART_GET_FIELD_FROM_MTERP(Byte, int8_t, ssize_t, ) -ART_GET_FIELD_FROM_MTERP(Boolean, uint8_t, size_t, ) -ART_GET_FIELD_FROM_MTERP(Short, int16_t, ssize_t, ) -ART_GET_FIELD_FROM_MTERP(Char, uint16_t, size_t, ) -ART_GET_FIELD_FROM_MTERP(32, uint32_t, size_t, ) -ART_GET_FIELD_FROM_MTERP(64, uint64_t, uint64_t, ) -ART_GET_FIELD_FROM_MTERP(Obj, mirror::HeapReference<mirror::Object>, mirror::Object*, .Ptr()) +ART_GET_FIELD_FROM_MTERP(I8, Byte, int8_t, ssize_t, ) +ART_GET_FIELD_FROM_MTERP(U8, Boolean, uint8_t, size_t, ) +ART_GET_FIELD_FROM_MTERP(I16, Short, int16_t, ssize_t, ) +ART_GET_FIELD_FROM_MTERP(U16, Char, uint16_t, size_t, ) +ART_GET_FIELD_FROM_MTERP(U32, 32, uint32_t, size_t, ) +ART_GET_FIELD_FROM_MTERP(U64, 64, uint64_t, uint64_t, ) +ART_GET_FIELD_FROM_MTERP(Obj, Obj, mirror::HeapReference<mirror::Object>, mirror::Object*, .Ptr()) #undef ART_GET_FIELD_FROM_MTERP -extern "C" ssize_t artSet8InstanceFromMterp(uint32_t field_idx, - mirror::Object* obj, - uint8_t new_value, - ArtMethod* referrer) +extern "C" ssize_t MterpIPutU8(uint32_t field_idx, + mirror::Object* obj, + uint8_t new_value, + ArtMethod* referrer) REQUIRES_SHARED(Locks::mutator_lock_) { ArtField* field = referrer->GetDexCache()->GetResolvedField(field_idx, kRuntimePointerSize); if (LIKELY(field != nullptr && obj != nullptr)) { - Primitive::Type type = field->GetTypeAsPrimitiveType(); - if (type == Primitive::kPrimBoolean) { - field->SetBoolean<false>(obj, new_value); - } else { - DCHECK_EQ(Primitive::kPrimByte, type); - field->SetByte<false>(obj, new_value); - } + field->SetBoolean<false>(obj, new_value); return 0; // success } return -1; // failure } -extern "C" ssize_t artSet16InstanceFromMterp(uint32_t field_idx, - mirror::Object* obj, - uint16_t new_value, - ArtMethod* referrer) +extern "C" ssize_t MterpIPutI8(uint32_t field_idx, + mirror::Object* obj, + uint8_t new_value, + ArtMethod* referrer) REQUIRES_SHARED(Locks::mutator_lock_) { ArtField* field = referrer->GetDexCache()->GetResolvedField(field_idx, kRuntimePointerSize); if (LIKELY(field != nullptr && obj != nullptr)) { - Primitive::Type type = field->GetTypeAsPrimitiveType(); - if (type == Primitive::kPrimChar) { - field->SetChar<false>(obj, new_value); - } else { - DCHECK_EQ(Primitive::kPrimShort, type); - field->SetShort<false>(obj, new_value); - } + field->SetByte<false>(obj, new_value); + return 0; // success + } + return -1; // failure +} + +extern "C" ssize_t MterpIPutU16(uint32_t field_idx, + mirror::Object* obj, + uint16_t new_value, + ArtMethod* referrer) + REQUIRES_SHARED(Locks::mutator_lock_) { + ArtField* field = referrer->GetDexCache()->GetResolvedField(field_idx, kRuntimePointerSize); + if (LIKELY(field != nullptr && obj != nullptr)) { + field->SetChar<false>(obj, new_value); + return 0; // success + } + return -1; // failure +} + +extern "C" ssize_t MterpIPutI16(uint32_t field_idx, + mirror::Object* obj, + uint16_t new_value, + ArtMethod* referrer) + REQUIRES_SHARED(Locks::mutator_lock_) { + ArtField* field = referrer->GetDexCache()->GetResolvedField(field_idx, kRuntimePointerSize); + if (LIKELY(field != nullptr && obj != nullptr)) { + field->SetShort<false>(obj, new_value); return 0; // success } return -1; // failure } -extern "C" ssize_t artSet32InstanceFromMterp(uint32_t field_idx, - mirror::Object* obj, - uint32_t new_value, - ArtMethod* referrer) +extern "C" ssize_t MterpIPutU32(uint32_t field_idx, + mirror::Object* obj, + uint32_t new_value, + ArtMethod* referrer) REQUIRES_SHARED(Locks::mutator_lock_) { ArtField* field = referrer->GetDexCache()->GetResolvedField(field_idx, kRuntimePointerSize); if (LIKELY(field != nullptr && obj != nullptr)) { @@ -809,10 +823,10 @@ extern "C" ssize_t artSet32InstanceFromMterp(uint32_t field_idx, return -1; // failure } -extern "C" ssize_t artSet64InstanceFromMterp(uint32_t field_idx, - mirror::Object* obj, - uint64_t* new_value, - ArtMethod* referrer) +extern "C" ssize_t MterpIPutU64(uint32_t field_idx, + mirror::Object* obj, + uint64_t* new_value, + ArtMethod* referrer) REQUIRES_SHARED(Locks::mutator_lock_) { ArtField* field = referrer->GetDexCache()->GetResolvedField(field_idx, kRuntimePointerSize); if (LIKELY(field != nullptr && obj != nullptr)) { @@ -854,9 +868,9 @@ ALWAYS_INLINE return_type MterpGetStatic(uint32_t field_idx, return res; } -extern "C" int32_t MterpGetBooleanStatic(uint32_t field_idx, - ArtMethod* referrer, - Thread* self) +extern "C" int32_t MterpSGetU8(uint32_t field_idx, + ArtMethod* referrer, + Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpGetStatic<uint8_t, Primitive::kPrimBoolean>(field_idx, referrer, @@ -864,9 +878,9 @@ extern "C" int32_t MterpGetBooleanStatic(uint32_t field_idx, &ArtField::GetBoolean); } -extern "C" int32_t MterpGetByteStatic(uint32_t field_idx, - ArtMethod* referrer, - Thread* self) +extern "C" int32_t MterpSGetI8(uint32_t field_idx, + ArtMethod* referrer, + Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpGetStatic<int8_t, Primitive::kPrimByte>(field_idx, referrer, @@ -874,9 +888,9 @@ extern "C" int32_t MterpGetByteStatic(uint32_t field_idx, &ArtField::GetByte); } -extern "C" uint32_t MterpGetCharStatic(uint32_t field_idx, - ArtMethod* referrer, - Thread* self) +extern "C" uint32_t MterpSGetU16(uint32_t field_idx, + ArtMethod* referrer, + Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpGetStatic<uint16_t, Primitive::kPrimChar>(field_idx, referrer, @@ -884,9 +898,9 @@ extern "C" uint32_t MterpGetCharStatic(uint32_t field_idx, &ArtField::GetChar); } -extern "C" int32_t MterpGetShortStatic(uint32_t field_idx, - ArtMethod* referrer, - Thread* self) +extern "C" int32_t MterpSGetI16(uint32_t field_idx, + ArtMethod* referrer, + Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpGetStatic<int16_t, Primitive::kPrimShort>(field_idx, referrer, @@ -894,9 +908,9 @@ extern "C" int32_t MterpGetShortStatic(uint32_t field_idx, &ArtField::GetShort); } -extern "C" mirror::Object* MterpGetObjStatic(uint32_t field_idx, - ArtMethod* referrer, - Thread* self) +extern "C" mirror::Object* MterpSGetObj(uint32_t field_idx, + ArtMethod* referrer, + Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpGetStatic<ObjPtr<mirror::Object>, Primitive::kPrimNot>(field_idx, referrer, @@ -904,9 +918,9 @@ extern "C" mirror::Object* MterpGetObjStatic(uint32_t field_idx, &ArtField::GetObject).Ptr(); } -extern "C" int32_t MterpGet32Static(uint32_t field_idx, - ArtMethod* referrer, - Thread* self) +extern "C" int32_t MterpSGetU32(uint32_t field_idx, + ArtMethod* referrer, + Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpGetStatic<int32_t, Primitive::kPrimInt>(field_idx, referrer, @@ -914,7 +928,7 @@ extern "C" int32_t MterpGet32Static(uint32_t field_idx, &ArtField::GetInt); } -extern "C" int64_t MterpGet64Static(uint32_t field_idx, ArtMethod* referrer, Thread* self) +extern "C" int64_t MterpSGetU64(uint32_t field_idx, ArtMethod* referrer, Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpGetStatic<int64_t, Primitive::kPrimLong>(field_idx, referrer, @@ -942,10 +956,10 @@ int MterpSetStatic(uint32_t field_idx, return res; } -extern "C" int MterpSetBooleanStatic(uint32_t field_idx, - uint8_t new_value, - ArtMethod* referrer, - Thread* self) +extern "C" int MterpSPutU8(uint32_t field_idx, + uint8_t new_value, + ArtMethod* referrer, + Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpSetStatic<uint8_t, Primitive::kPrimBoolean>(field_idx, new_value, @@ -954,10 +968,10 @@ extern "C" int MterpSetBooleanStatic(uint32_t field_idx, &ArtField::SetBoolean<false>); } -extern "C" int MterpSetByteStatic(uint32_t field_idx, - int8_t new_value, - ArtMethod* referrer, - Thread* self) +extern "C" int MterpSPutI8(uint32_t field_idx, + int8_t new_value, + ArtMethod* referrer, + Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpSetStatic<int8_t, Primitive::kPrimByte>(field_idx, new_value, @@ -966,10 +980,10 @@ extern "C" int MterpSetByteStatic(uint32_t field_idx, &ArtField::SetByte<false>); } -extern "C" int MterpSetCharStatic(uint32_t field_idx, - uint16_t new_value, - ArtMethod* referrer, - Thread* self) +extern "C" int MterpSPutU16(uint32_t field_idx, + uint16_t new_value, + ArtMethod* referrer, + Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpSetStatic<uint16_t, Primitive::kPrimChar>(field_idx, new_value, @@ -978,10 +992,10 @@ extern "C" int MterpSetCharStatic(uint32_t field_idx, &ArtField::SetChar<false>); } -extern "C" int MterpSetShortStatic(uint32_t field_idx, - int16_t new_value, - ArtMethod* referrer, - Thread* self) +extern "C" int MterpSPutI16(uint32_t field_idx, + int16_t new_value, + ArtMethod* referrer, + Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpSetStatic<int16_t, Primitive::kPrimShort>(field_idx, new_value, @@ -990,10 +1004,10 @@ extern "C" int MterpSetShortStatic(uint32_t field_idx, &ArtField::SetShort<false>); } -extern "C" int MterpSet32Static(uint32_t field_idx, - int32_t new_value, - ArtMethod* referrer, - Thread* self) +extern "C" int MterpSPutU32(uint32_t field_idx, + int32_t new_value, + ArtMethod* referrer, + Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpSetStatic<int32_t, Primitive::kPrimInt>(field_idx, new_value, @@ -1002,10 +1016,10 @@ extern "C" int MterpSet32Static(uint32_t field_idx, &ArtField::SetInt<false>); } -extern "C" int MterpSet64Static(uint32_t field_idx, - int64_t* new_value, - ArtMethod* referrer, - Thread* self) +extern "C" int MterpSPutU64(uint32_t field_idx, + int64_t* new_value, + ArtMethod* referrer, + Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { return MterpSetStatic<int64_t, Primitive::kPrimLong>(field_idx, *new_value, diff --git a/runtime/interpreter/mterp/out/mterp_arm.S b/runtime/interpreter/mterp/out/mterp_arm.S index fd5d647624..b73067f64a 100644 --- a/runtime/interpreter/mterp/out/mterp_arm.S +++ b/runtime/interpreter/mterp/out/mterp_arm.S @@ -2255,7 +2255,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG r1, r1 @ r1<- fp[B], the object pointer ldr r2, [rFP, #OFF_FP_METHOD] @ r2<- referrer mov r3, rSELF @ r3<- self - bl artGet32InstanceFromMterp + bl MterpIGetU32 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] ubfx r2, rINST, #8, #4 @ r2<- A PREFETCH_INST 2 @@ -2285,7 +2285,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG r1, r1 @ r1<- fp[B], the object pointer ldr r2, [rFP, #OFF_FP_METHOD] @ r2<- referrer mov r3, rSELF @ r3<- self - bl artGet64InstanceFromMterp + bl MterpIGetU64 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] ubfx r2, rINST, #8, #4 @ r2<- A PREFETCH_INST 2 @@ -2314,7 +2314,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG r1, r1 @ r1<- fp[B], the object pointer ldr r2, [rFP, #OFF_FP_METHOD] @ r2<- referrer mov r3, rSELF @ r3<- self - bl artGetObjInstanceFromMterp + bl MterpIGetObj ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] ubfx r2, rINST, #8, #4 @ r2<- A PREFETCH_INST 2 @@ -2346,7 +2346,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG r1, r1 @ r1<- fp[B], the object pointer ldr r2, [rFP, #OFF_FP_METHOD] @ r2<- referrer mov r3, rSELF @ r3<- self - bl artGetBooleanInstanceFromMterp + bl MterpIGetU8 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] ubfx r2, rINST, #8, #4 @ r2<- A PREFETCH_INST 2 @@ -2378,7 +2378,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG r1, r1 @ r1<- fp[B], the object pointer ldr r2, [rFP, #OFF_FP_METHOD] @ r2<- referrer mov r3, rSELF @ r3<- self - bl artGetByteInstanceFromMterp + bl MterpIGetI8 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] ubfx r2, rINST, #8, #4 @ r2<- A PREFETCH_INST 2 @@ -2410,7 +2410,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG r1, r1 @ r1<- fp[B], the object pointer ldr r2, [rFP, #OFF_FP_METHOD] @ r2<- referrer mov r3, rSELF @ r3<- self - bl artGetCharInstanceFromMterp + bl MterpIGetU16 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] ubfx r2, rINST, #8, #4 @ r2<- A PREFETCH_INST 2 @@ -2442,7 +2442,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG r1, r1 @ r1<- fp[B], the object pointer ldr r2, [rFP, #OFF_FP_METHOD] @ r2<- referrer mov r3, rSELF @ r3<- self - bl artGetShortInstanceFromMterp + bl MterpIGetI16 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] ubfx r2, rINST, #8, #4 @ r2<- A PREFETCH_INST 2 @@ -2468,7 +2468,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet32InstanceFromMterp + .extern MterpIPutU32 EXPORT_PC FETCH r0, 1 @ r0<- field ref CCCC mov r1, rINST, lsr #12 @ r1<- B @@ -2477,7 +2477,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG r2, r2 @ r2<- fp[A] ldr r3, [rFP, #OFF_FP_METHOD] @ r3<- referrer PREFETCH_INST 2 - bl artSet32InstanceFromMterp + bl MterpIPutU32 cmp r0, #0 bne MterpPossibleException ADVANCE 2 @ advance rPC @@ -2489,7 +2489,7 @@ artMterpAsmInstructionStart = .L_op_nop .L_op_iput_wide: /* 0x5a */ /* File: arm/op_iput_wide.S */ /* iput-wide vA, vB, field@CCCC */ - .extern artSet64InstanceFromMterp + .extern MterpIPutU64 EXPORT_PC FETCH r0, 1 @ r0<- field ref CCCC mov r1, rINST, lsr #12 @ r1<- B @@ -2498,7 +2498,7 @@ artMterpAsmInstructionStart = .L_op_nop VREG_INDEX_TO_ADDR r2, r2 @ r2<- &fp[A] ldr r3, [rFP, #OFF_FP_METHOD] @ r3<- referrer PREFETCH_INST 2 - bl artSet64InstanceFromMterp + bl MterpIPutU64 cmp r0, #0 bne MterpPossibleException ADVANCE 2 @ advance rPC @@ -2514,7 +2514,7 @@ artMterpAsmInstructionStart = .L_op_nop mov r1, rPC mov r2, rINST mov r3, rSELF - bl MterpIputObject + bl MterpIPutObj cmp r0, #0 beq MterpException FETCH_ADVANCE_INST 2 @ advance rPC, load rINST @@ -2532,7 +2532,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet8InstanceFromMterp + .extern MterpIPutU8 EXPORT_PC FETCH r0, 1 @ r0<- field ref CCCC mov r1, rINST, lsr #12 @ r1<- B @@ -2541,7 +2541,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG r2, r2 @ r2<- fp[A] ldr r3, [rFP, #OFF_FP_METHOD] @ r3<- referrer PREFETCH_INST 2 - bl artSet8InstanceFromMterp + bl MterpIPutU8 cmp r0, #0 bne MterpPossibleException ADVANCE 2 @ advance rPC @@ -2560,7 +2560,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet8InstanceFromMterp + .extern MterpIPutI8 EXPORT_PC FETCH r0, 1 @ r0<- field ref CCCC mov r1, rINST, lsr #12 @ r1<- B @@ -2569,7 +2569,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG r2, r2 @ r2<- fp[A] ldr r3, [rFP, #OFF_FP_METHOD] @ r3<- referrer PREFETCH_INST 2 - bl artSet8InstanceFromMterp + bl MterpIPutI8 cmp r0, #0 bne MterpPossibleException ADVANCE 2 @ advance rPC @@ -2588,7 +2588,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet16InstanceFromMterp + .extern MterpIPutU16 EXPORT_PC FETCH r0, 1 @ r0<- field ref CCCC mov r1, rINST, lsr #12 @ r1<- B @@ -2597,7 +2597,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG r2, r2 @ r2<- fp[A] ldr r3, [rFP, #OFF_FP_METHOD] @ r3<- referrer PREFETCH_INST 2 - bl artSet16InstanceFromMterp + bl MterpIPutU16 cmp r0, #0 bne MterpPossibleException ADVANCE 2 @ advance rPC @@ -2616,7 +2616,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet16InstanceFromMterp + .extern MterpIPutI16 EXPORT_PC FETCH r0, 1 @ r0<- field ref CCCC mov r1, rINST, lsr #12 @ r1<- B @@ -2625,7 +2625,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG r2, r2 @ r2<- fp[A] ldr r3, [rFP, #OFF_FP_METHOD] @ r3<- referrer PREFETCH_INST 2 - bl artSet16InstanceFromMterp + bl MterpIPutI16 cmp r0, #0 bne MterpPossibleException ADVANCE 2 @ advance rPC @@ -2644,12 +2644,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* op vAA, field@BBBB */ - .extern MterpGet32Static + .extern MterpSGetU32 EXPORT_PC FETCH r0, 1 @ r0<- field ref BBBB ldr r1, [rFP, #OFF_FP_METHOD] mov r2, rSELF - bl MterpGet32Static + bl MterpSGetU32 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] mov r2, rINST, lsr #8 @ r2<- AA PREFETCH_INST 2 @@ -2674,12 +2674,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* sget-wide vAA, field@BBBB */ - .extern MterpGet64Static + .extern MterpSGetU64 EXPORT_PC FETCH r0, 1 @ r0<- field ref BBBB ldr r1, [rFP, #OFF_FP_METHOD] mov r2, rSELF - bl MterpGet64Static + bl MterpSGetU64 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] mov r9, rINST, lsr #8 @ r9<- AA VREG_INDEX_TO_ADDR lr, r9 @ r9<- &fp[AA] @@ -2703,12 +2703,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* op vAA, field@BBBB */ - .extern MterpGetObjStatic + .extern MterpSGetObj EXPORT_PC FETCH r0, 1 @ r0<- field ref BBBB ldr r1, [rFP, #OFF_FP_METHOD] mov r2, rSELF - bl MterpGetObjStatic + bl MterpSGetObj ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] mov r2, rINST, lsr #8 @ r2<- AA PREFETCH_INST 2 @@ -2736,12 +2736,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* op vAA, field@BBBB */ - .extern MterpGetBooleanStatic + .extern MterpSGetU8 EXPORT_PC FETCH r0, 1 @ r0<- field ref BBBB ldr r1, [rFP, #OFF_FP_METHOD] mov r2, rSELF - bl MterpGetBooleanStatic + bl MterpSGetU8 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] mov r2, rINST, lsr #8 @ r2<- AA PREFETCH_INST 2 @@ -2769,12 +2769,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* op vAA, field@BBBB */ - .extern MterpGetByteStatic + .extern MterpSGetI8 EXPORT_PC FETCH r0, 1 @ r0<- field ref BBBB ldr r1, [rFP, #OFF_FP_METHOD] mov r2, rSELF - bl MterpGetByteStatic + bl MterpSGetI8 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] mov r2, rINST, lsr #8 @ r2<- AA PREFETCH_INST 2 @@ -2802,12 +2802,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* op vAA, field@BBBB */ - .extern MterpGetCharStatic + .extern MterpSGetU16 EXPORT_PC FETCH r0, 1 @ r0<- field ref BBBB ldr r1, [rFP, #OFF_FP_METHOD] mov r2, rSELF - bl MterpGetCharStatic + bl MterpSGetU16 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] mov r2, rINST, lsr #8 @ r2<- AA PREFETCH_INST 2 @@ -2835,12 +2835,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* op vAA, field@BBBB */ - .extern MterpGetShortStatic + .extern MterpSGetI16 EXPORT_PC FETCH r0, 1 @ r0<- field ref BBBB ldr r1, [rFP, #OFF_FP_METHOD] mov r2, rSELF - bl MterpGetShortStatic + bl MterpSGetI16 ldr r3, [rSELF, #THREAD_EXCEPTION_OFFSET] mov r2, rINST, lsr #8 @ r2<- AA PREFETCH_INST 2 @@ -2873,7 +2873,7 @@ artMterpAsmInstructionStart = .L_op_nop ldr r2, [rFP, #OFF_FP_METHOD] mov r3, rSELF PREFETCH_INST 2 @ Get next inst, but don't advance rPC - bl MterpSet32Static + bl MterpSPutU32 cmp r0, #0 @ 0 on success, -1 on failure bne MterpException ADVANCE 2 @ Past exception point - now advance rPC @@ -2889,7 +2889,7 @@ artMterpAsmInstructionStart = .L_op_nop * */ /* sput-wide vAA, field@BBBB */ - .extern MterpSet64Static + .extern MterpSPutU64 EXPORT_PC FETCH r0, 1 @ r0<- field ref BBBB mov r1, rINST, lsr #8 @ r1<- AA @@ -2897,7 +2897,7 @@ artMterpAsmInstructionStart = .L_op_nop ldr r2, [rFP, #OFF_FP_METHOD] mov r3, rSELF PREFETCH_INST 2 @ Get next inst, but don't advance rPC - bl MterpSet64Static + bl MterpSPutU64 cmp r0, #0 @ 0 on success, -1 on failure bne MterpException ADVANCE 2 @ Past exception point - now advance rPC @@ -2913,7 +2913,7 @@ artMterpAsmInstructionStart = .L_op_nop mov r1, rPC mov r2, rINST mov r3, rSELF - bl MterpSputObject + bl MterpSPutObj cmp r0, #0 beq MterpException FETCH_ADVANCE_INST 2 @ advance rPC, load rINST @@ -2938,7 +2938,7 @@ artMterpAsmInstructionStart = .L_op_nop ldr r2, [rFP, #OFF_FP_METHOD] mov r3, rSELF PREFETCH_INST 2 @ Get next inst, but don't advance rPC - bl MterpSetBooleanStatic + bl MterpSPutU8 cmp r0, #0 @ 0 on success, -1 on failure bne MterpException ADVANCE 2 @ Past exception point - now advance rPC @@ -2964,7 +2964,7 @@ artMterpAsmInstructionStart = .L_op_nop ldr r2, [rFP, #OFF_FP_METHOD] mov r3, rSELF PREFETCH_INST 2 @ Get next inst, but don't advance rPC - bl MterpSetByteStatic + bl MterpSPutI8 cmp r0, #0 @ 0 on success, -1 on failure bne MterpException ADVANCE 2 @ Past exception point - now advance rPC @@ -2990,7 +2990,7 @@ artMterpAsmInstructionStart = .L_op_nop ldr r2, [rFP, #OFF_FP_METHOD] mov r3, rSELF PREFETCH_INST 2 @ Get next inst, but don't advance rPC - bl MterpSetCharStatic + bl MterpSPutU16 cmp r0, #0 @ 0 on success, -1 on failure bne MterpException ADVANCE 2 @ Past exception point - now advance rPC @@ -3016,7 +3016,7 @@ artMterpAsmInstructionStart = .L_op_nop ldr r2, [rFP, #OFF_FP_METHOD] mov r3, rSELF PREFETCH_INST 2 @ Get next inst, but don't advance rPC - bl MterpSetShortStatic + bl MterpSPutI16 cmp r0, #0 @ 0 on success, -1 on failure bne MterpException ADVANCE 2 @ Past exception point - now advance rPC diff --git a/runtime/interpreter/mterp/out/mterp_arm64.S b/runtime/interpreter/mterp/out/mterp_arm64.S index 213f7ff842..770b109f41 100644 --- a/runtime/interpreter/mterp/out/mterp_arm64.S +++ b/runtime/interpreter/mterp/out/mterp_arm64.S @@ -2192,7 +2192,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG w1, w1 // w1<- fp[B], the object pointer ldr x2, [xFP, #OFF_FP_METHOD] // w2<- referrer mov x3, xSELF // w3<- self - bl artGet32InstanceFromMterp + bl MterpIGetU32 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] ubfx w2, wINST, #8, #4 // w2<- A @@ -2222,7 +2222,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG w1, w1 // w1<- fp[B], the object pointer ldr x2, [xFP, #OFF_FP_METHOD] // w2<- referrer mov x3, xSELF // w3<- self - bl artGet64InstanceFromMterp + bl MterpIGetU64 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] ubfx w2, wINST, #8, #4 // w2<- A PREFETCH_INST 2 @@ -2249,7 +2249,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG w1, w1 // w1<- fp[B], the object pointer ldr x2, [xFP, #OFF_FP_METHOD] // w2<- referrer mov x3, xSELF // w3<- self - bl artGetObjInstanceFromMterp + bl MterpIGetObj ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] ubfx w2, wINST, #8, #4 // w2<- A @@ -2281,7 +2281,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG w1, w1 // w1<- fp[B], the object pointer ldr x2, [xFP, #OFF_FP_METHOD] // w2<- referrer mov x3, xSELF // w3<- self - bl artGetBooleanInstanceFromMterp + bl MterpIGetU8 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] uxtb w0, w0 ubfx w2, wINST, #8, #4 // w2<- A @@ -2313,7 +2313,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG w1, w1 // w1<- fp[B], the object pointer ldr x2, [xFP, #OFF_FP_METHOD] // w2<- referrer mov x3, xSELF // w3<- self - bl artGetByteInstanceFromMterp + bl MterpIGetI8 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] sxtb w0, w0 ubfx w2, wINST, #8, #4 // w2<- A @@ -2345,7 +2345,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG w1, w1 // w1<- fp[B], the object pointer ldr x2, [xFP, #OFF_FP_METHOD] // w2<- referrer mov x3, xSELF // w3<- self - bl artGetCharInstanceFromMterp + bl MterpIGetU16 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] uxth w0, w0 ubfx w2, wINST, #8, #4 // w2<- A @@ -2377,7 +2377,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG w1, w1 // w1<- fp[B], the object pointer ldr x2, [xFP, #OFF_FP_METHOD] // w2<- referrer mov x3, xSELF // w3<- self - bl artGetShortInstanceFromMterp + bl MterpIGetI16 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] sxth w0, w0 ubfx w2, wINST, #8, #4 // w2<- A @@ -2403,7 +2403,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field//CCCC */ - .extern artSet32InstanceFromMterp + .extern MterpIPutU32 EXPORT_PC FETCH w0, 1 // w0<- field ref CCCC lsr w1, wINST, #12 // w1<- B @@ -2412,7 +2412,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG w2, w2 // w2<- fp[A] ldr x3, [xFP, #OFF_FP_METHOD] // w3<- referrer PREFETCH_INST 2 - bl artSet32InstanceFromMterp + bl MterpIPutU32 cbnz w0, MterpPossibleException ADVANCE 2 // advance rPC GET_INST_OPCODE ip // extract opcode from rINST @@ -2423,7 +2423,7 @@ artMterpAsmInstructionStart = .L_op_nop .L_op_iput_wide: /* 0x5a */ /* File: arm64/op_iput_wide.S */ /* iput-wide vA, vB, field//CCCC */ - .extern artSet64InstanceFromMterp + .extern MterpIPutU64 EXPORT_PC FETCH w0, 1 // w0<- field ref CCCC lsr w1, wINST, #12 // w1<- B @@ -2432,7 +2432,7 @@ artMterpAsmInstructionStart = .L_op_nop VREG_INDEX_TO_ADDR x2, x2 // w2<- &fp[A] ldr x3, [xFP, #OFF_FP_METHOD] // w3<- referrer PREFETCH_INST 2 - bl artSet64InstanceFromMterp + bl MterpIPutU64 cbnz w0, MterpPossibleException ADVANCE 2 // advance rPC GET_INST_OPCODE ip // extract opcode from wINST @@ -2447,7 +2447,7 @@ artMterpAsmInstructionStart = .L_op_nop mov x1, xPC mov w2, wINST mov x3, xSELF - bl MterpIputObject + bl MterpIPutObj cbz w0, MterpException FETCH_ADVANCE_INST 2 // advance rPC, load rINST GET_INST_OPCODE ip // extract opcode from rINST @@ -2464,7 +2464,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field//CCCC */ - .extern artSet8InstanceFromMterp + .extern MterpIPutU8 EXPORT_PC FETCH w0, 1 // w0<- field ref CCCC lsr w1, wINST, #12 // w1<- B @@ -2473,7 +2473,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG w2, w2 // w2<- fp[A] ldr x3, [xFP, #OFF_FP_METHOD] // w3<- referrer PREFETCH_INST 2 - bl artSet8InstanceFromMterp + bl MterpIPutU8 cbnz w0, MterpPossibleException ADVANCE 2 // advance rPC GET_INST_OPCODE ip // extract opcode from rINST @@ -2491,7 +2491,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field//CCCC */ - .extern artSet8InstanceFromMterp + .extern MterpIPutI8 EXPORT_PC FETCH w0, 1 // w0<- field ref CCCC lsr w1, wINST, #12 // w1<- B @@ -2500,7 +2500,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG w2, w2 // w2<- fp[A] ldr x3, [xFP, #OFF_FP_METHOD] // w3<- referrer PREFETCH_INST 2 - bl artSet8InstanceFromMterp + bl MterpIPutI8 cbnz w0, MterpPossibleException ADVANCE 2 // advance rPC GET_INST_OPCODE ip // extract opcode from rINST @@ -2518,7 +2518,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field//CCCC */ - .extern artSet16InstanceFromMterp + .extern MterpIPutU16 EXPORT_PC FETCH w0, 1 // w0<- field ref CCCC lsr w1, wINST, #12 // w1<- B @@ -2527,7 +2527,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG w2, w2 // w2<- fp[A] ldr x3, [xFP, #OFF_FP_METHOD] // w3<- referrer PREFETCH_INST 2 - bl artSet16InstanceFromMterp + bl MterpIPutU16 cbnz w0, MterpPossibleException ADVANCE 2 // advance rPC GET_INST_OPCODE ip // extract opcode from rINST @@ -2545,7 +2545,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field//CCCC */ - .extern artSet16InstanceFromMterp + .extern MterpIPutI16 EXPORT_PC FETCH w0, 1 // w0<- field ref CCCC lsr w1, wINST, #12 // w1<- B @@ -2554,7 +2554,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG w2, w2 // w2<- fp[A] ldr x3, [xFP, #OFF_FP_METHOD] // w3<- referrer PREFETCH_INST 2 - bl artSet16InstanceFromMterp + bl MterpIPutI16 cbnz w0, MterpPossibleException ADVANCE 2 // advance rPC GET_INST_OPCODE ip // extract opcode from rINST @@ -2572,12 +2572,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* op vAA, field//BBBB */ - .extern MterpGet32Static + .extern MterpSGetU32 EXPORT_PC FETCH w0, 1 // w0<- field ref BBBB ldr x1, [xFP, #OFF_FP_METHOD] mov x2, xSELF - bl MterpGet32Static + bl MterpSGetU32 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] lsr w2, wINST, #8 // w2<- AA @@ -2607,7 +2607,7 @@ artMterpAsmInstructionStart = .L_op_nop FETCH w0, 1 // w0<- field ref BBBB ldr x1, [xFP, #OFF_FP_METHOD] mov x2, xSELF - bl MterpGet64Static + bl MterpSGetU64 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] lsr w4, wINST, #8 // w4<- AA cbnz x3, MterpException // bail out @@ -2628,12 +2628,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* op vAA, field//BBBB */ - .extern MterpGetObjStatic + .extern MterpSGetObj EXPORT_PC FETCH w0, 1 // w0<- field ref BBBB ldr x1, [xFP, #OFF_FP_METHOD] mov x2, xSELF - bl MterpGetObjStatic + bl MterpSGetObj ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] lsr w2, wINST, #8 // w2<- AA @@ -2661,12 +2661,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* op vAA, field//BBBB */ - .extern MterpGetBooleanStatic + .extern MterpSGetU8 EXPORT_PC FETCH w0, 1 // w0<- field ref BBBB ldr x1, [xFP, #OFF_FP_METHOD] mov x2, xSELF - bl MterpGetBooleanStatic + bl MterpSGetU8 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] lsr w2, wINST, #8 // w2<- AA uxtb w0, w0 @@ -2694,12 +2694,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* op vAA, field//BBBB */ - .extern MterpGetByteStatic + .extern MterpSGetI8 EXPORT_PC FETCH w0, 1 // w0<- field ref BBBB ldr x1, [xFP, #OFF_FP_METHOD] mov x2, xSELF - bl MterpGetByteStatic + bl MterpSGetI8 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] lsr w2, wINST, #8 // w2<- AA sxtb w0, w0 @@ -2727,12 +2727,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* op vAA, field//BBBB */ - .extern MterpGetCharStatic + .extern MterpSGetU16 EXPORT_PC FETCH w0, 1 // w0<- field ref BBBB ldr x1, [xFP, #OFF_FP_METHOD] mov x2, xSELF - bl MterpGetCharStatic + bl MterpSGetU16 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] lsr w2, wINST, #8 // w2<- AA uxth w0, w0 @@ -2760,12 +2760,12 @@ artMterpAsmInstructionStart = .L_op_nop */ /* op vAA, field//BBBB */ - .extern MterpGetShortStatic + .extern MterpSGetI16 EXPORT_PC FETCH w0, 1 // w0<- field ref BBBB ldr x1, [xFP, #OFF_FP_METHOD] mov x2, xSELF - bl MterpGetShortStatic + bl MterpSGetI16 ldr x3, [xSELF, #THREAD_EXCEPTION_OFFSET] lsr w2, wINST, #8 // w2<- AA sxth w0, w0 @@ -2798,7 +2798,7 @@ artMterpAsmInstructionStart = .L_op_nop ldr x2, [xFP, #OFF_FP_METHOD] mov x3, xSELF PREFETCH_INST 2 // Get next inst, but don't advance rPC - bl MterpSet32Static + bl MterpSPutU32 cbnz w0, MterpException // 0 on success ADVANCE 2 // Past exception point - now advance rPC GET_INST_OPCODE ip // extract opcode from rINST @@ -2813,7 +2813,7 @@ artMterpAsmInstructionStart = .L_op_nop * */ /* sput-wide vAA, field//BBBB */ - .extern MterpSet64Static + .extern MterpSPutU64 EXPORT_PC FETCH w0, 1 // w0<- field ref BBBB lsr w1, wINST, #8 // w1<- AA @@ -2821,7 +2821,7 @@ artMterpAsmInstructionStart = .L_op_nop ldr x2, [xFP, #OFF_FP_METHOD] mov x3, xSELF PREFETCH_INST 2 // Get next inst, but don't advance rPC - bl MterpSet64Static + bl MterpSPutU64 cbnz w0, MterpException // 0 on success, -1 on failure ADVANCE 2 // Past exception point - now advance rPC GET_INST_OPCODE ip // extract opcode from wINST @@ -2836,7 +2836,7 @@ artMterpAsmInstructionStart = .L_op_nop mov x1, xPC mov x2, xINST mov x3, xSELF - bl MterpSputObject + bl MterpSPutObj cbz w0, MterpException FETCH_ADVANCE_INST 2 // advance rPC, load rINST GET_INST_OPCODE ip // extract opcode from rINST @@ -2860,7 +2860,7 @@ artMterpAsmInstructionStart = .L_op_nop ldr x2, [xFP, #OFF_FP_METHOD] mov x3, xSELF PREFETCH_INST 2 // Get next inst, but don't advance rPC - bl MterpSetBooleanStatic + bl MterpSPutU8 cbnz w0, MterpException // 0 on success ADVANCE 2 // Past exception point - now advance rPC GET_INST_OPCODE ip // extract opcode from rINST @@ -2885,7 +2885,7 @@ artMterpAsmInstructionStart = .L_op_nop ldr x2, [xFP, #OFF_FP_METHOD] mov x3, xSELF PREFETCH_INST 2 // Get next inst, but don't advance rPC - bl MterpSetByteStatic + bl MterpSPutI8 cbnz w0, MterpException // 0 on success ADVANCE 2 // Past exception point - now advance rPC GET_INST_OPCODE ip // extract opcode from rINST @@ -2910,7 +2910,7 @@ artMterpAsmInstructionStart = .L_op_nop ldr x2, [xFP, #OFF_FP_METHOD] mov x3, xSELF PREFETCH_INST 2 // Get next inst, but don't advance rPC - bl MterpSetCharStatic + bl MterpSPutU16 cbnz w0, MterpException // 0 on success ADVANCE 2 // Past exception point - now advance rPC GET_INST_OPCODE ip // extract opcode from rINST @@ -2935,7 +2935,7 @@ artMterpAsmInstructionStart = .L_op_nop ldr x2, [xFP, #OFF_FP_METHOD] mov x3, xSELF PREFETCH_INST 2 // Get next inst, but don't advance rPC - bl MterpSetShortStatic + bl MterpSPutI16 cbnz w0, MterpException // 0 on success ADVANCE 2 // Past exception point - now advance rPC GET_INST_OPCODE ip // extract opcode from rINST diff --git a/runtime/interpreter/mterp/out/mterp_mips.S b/runtime/interpreter/mterp/out/mterp_mips.S index c749057ee6..fb7d52eed4 100644 --- a/runtime/interpreter/mterp/out/mterp_mips.S +++ b/runtime/interpreter/mterp/out/mterp_mips.S @@ -2677,7 +2677,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG(a1, a1) # a1 <- fp[B], the object pointer lw a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - JAL(artGet32InstanceFromMterp) + JAL(MterpIGetU32) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA4(a2) # a2<- A+ PREFETCH_INST(2) # load rINST @@ -2706,7 +2706,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG(a1, a1) # a1 <- fp[B], the object pointer lw a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - JAL(artGet64InstanceFromMterp) + JAL(MterpIGetU64) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA4(a2) # a2<- A+ PREFETCH_INST(2) # load rINST @@ -2732,7 +2732,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG(a1, a1) # a1 <- fp[B], the object pointer lw a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - JAL(artGetObjInstanceFromMterp) + JAL(MterpIGetObj) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA4(a2) # a2<- A+ PREFETCH_INST(2) # load rINST @@ -2763,7 +2763,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG(a1, a1) # a1 <- fp[B], the object pointer lw a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - JAL(artGetBooleanInstanceFromMterp) + JAL(MterpIGetU8) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA4(a2) # a2<- A+ PREFETCH_INST(2) # load rINST @@ -2794,7 +2794,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG(a1, a1) # a1 <- fp[B], the object pointer lw a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - JAL(artGetByteInstanceFromMterp) + JAL(MterpIGetI8) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA4(a2) # a2<- A+ PREFETCH_INST(2) # load rINST @@ -2825,7 +2825,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG(a1, a1) # a1 <- fp[B], the object pointer lw a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - JAL(artGetCharInstanceFromMterp) + JAL(MterpIGetU16) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA4(a2) # a2<- A+ PREFETCH_INST(2) # load rINST @@ -2856,7 +2856,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG(a1, a1) # a1 <- fp[B], the object pointer lw a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - JAL(artGetShortInstanceFromMterp) + JAL(MterpIGetI16) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA4(a2) # a2<- A+ PREFETCH_INST(2) # load rINST @@ -2880,7 +2880,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet32InstanceFromMterp + .extern MterpIPutU32 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref CCCC GET_OPB(a1) # a1 <- B @@ -2889,7 +2889,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG(a2, a2) # a2 <- fp[A] lw a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST(2) # load rINST - JAL(artSet32InstanceFromMterp) + JAL(MterpIPutU32) bnez v0, MterpPossibleException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST @@ -2900,7 +2900,7 @@ artMterpAsmInstructionStart = .L_op_nop .L_op_iput_wide: /* 0x5a */ /* File: mips/op_iput_wide.S */ /* iput-wide vA, vB, field@CCCC */ - .extern artSet64InstanceFromMterp + .extern MterpIPutU64 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref CCCC GET_OPB(a1) # a1 <- B @@ -2909,7 +2909,7 @@ artMterpAsmInstructionStart = .L_op_nop EAS2(a2, rFP, a2) # a2 <- &fp[A] lw a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST(2) # load rINST - JAL(artSet64InstanceFromMterp) + JAL(MterpIPutU64) bnez v0, MterpPossibleException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST @@ -2930,7 +2930,7 @@ artMterpAsmInstructionStart = .L_op_nop move a1, rPC move a2, rINST move a3, rSELF - JAL(MterpIputObject) + JAL(MterpIPutObj) beqz v0, MterpException FETCH_ADVANCE_INST(2) # advance rPC, load rINST GET_INST_OPCODE(t0) # extract opcode from rINST @@ -2947,7 +2947,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet8InstanceFromMterp + .extern MterpIPutU8 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref CCCC GET_OPB(a1) # a1 <- B @@ -2956,7 +2956,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG(a2, a2) # a2 <- fp[A] lw a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST(2) # load rINST - JAL(artSet8InstanceFromMterp) + JAL(MterpIPutU8) bnez v0, MterpPossibleException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST @@ -2974,7 +2974,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet8InstanceFromMterp + .extern MterpIPutI8 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref CCCC GET_OPB(a1) # a1 <- B @@ -2983,7 +2983,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG(a2, a2) # a2 <- fp[A] lw a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST(2) # load rINST - JAL(artSet8InstanceFromMterp) + JAL(MterpIPutI8) bnez v0, MterpPossibleException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST @@ -3001,7 +3001,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet16InstanceFromMterp + .extern MterpIPutU16 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref CCCC GET_OPB(a1) # a1 <- B @@ -3010,7 +3010,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG(a2, a2) # a2 <- fp[A] lw a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST(2) # load rINST - JAL(artSet16InstanceFromMterp) + JAL(MterpIPutU16) bnez v0, MterpPossibleException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST @@ -3028,7 +3028,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet16InstanceFromMterp + .extern MterpIPutI16 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref CCCC GET_OPB(a1) # a1 <- B @@ -3037,7 +3037,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG(a2, a2) # a2 <- fp[A] lw a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST(2) # load rINST - JAL(artSet16InstanceFromMterp) + JAL(MterpIPutI16) bnez v0, MterpPossibleException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST @@ -3054,12 +3054,12 @@ artMterpAsmInstructionStart = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field@BBBB */ - .extern MterpGet32Static + .extern MterpSGetU32 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref BBBB lw a1, OFF_FP_METHOD(rFP) # a1 <- method move a2, rSELF # a2 <- self - JAL(MterpGet32Static) + JAL(MterpSGetU32) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA(a2) # a2 <- AA PREFETCH_INST(2) @@ -3080,12 +3080,12 @@ artMterpAsmInstructionStart = .L_op_nop * 64-bit SGET handler. */ /* sget-wide vAA, field@BBBB */ - .extern MterpGet64Static + .extern MterpSGetU64 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref BBBB lw a1, OFF_FP_METHOD(rFP) # a1 <- method move a2, rSELF # a2 <- self - JAL(MterpGet64Static) + JAL(MterpSGetU64) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) bnez a3, MterpException GET_OPA(a1) # a1 <- AA @@ -3104,12 +3104,12 @@ artMterpAsmInstructionStart = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field@BBBB */ - .extern MterpGetObjStatic + .extern MterpSGetObj EXPORT_PC() FETCH(a0, 1) # a0 <- field ref BBBB lw a1, OFF_FP_METHOD(rFP) # a1 <- method move a2, rSELF # a2 <- self - JAL(MterpGetObjStatic) + JAL(MterpSGetObj) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA(a2) # a2 <- AA PREFETCH_INST(2) @@ -3134,12 +3134,12 @@ artMterpAsmInstructionStart = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field@BBBB */ - .extern MterpGetBooleanStatic + .extern MterpSGetU8 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref BBBB lw a1, OFF_FP_METHOD(rFP) # a1 <- method move a2, rSELF # a2 <- self - JAL(MterpGetBooleanStatic) + JAL(MterpSGetU8) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA(a2) # a2 <- AA PREFETCH_INST(2) @@ -3164,12 +3164,12 @@ artMterpAsmInstructionStart = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field@BBBB */ - .extern MterpGetByteStatic + .extern MterpSGetI8 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref BBBB lw a1, OFF_FP_METHOD(rFP) # a1 <- method move a2, rSELF # a2 <- self - JAL(MterpGetByteStatic) + JAL(MterpSGetI8) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA(a2) # a2 <- AA PREFETCH_INST(2) @@ -3194,12 +3194,12 @@ artMterpAsmInstructionStart = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field@BBBB */ - .extern MterpGetCharStatic + .extern MterpSGetU16 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref BBBB lw a1, OFF_FP_METHOD(rFP) # a1 <- method move a2, rSELF # a2 <- self - JAL(MterpGetCharStatic) + JAL(MterpSGetU16) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA(a2) # a2 <- AA PREFETCH_INST(2) @@ -3224,12 +3224,12 @@ artMterpAsmInstructionStart = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field@BBBB */ - .extern MterpGetShortStatic + .extern MterpSGetI16 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref BBBB lw a1, OFF_FP_METHOD(rFP) # a1 <- method move a2, rSELF # a2 <- self - JAL(MterpGetShortStatic) + JAL(MterpSGetI16) lw a3, THREAD_EXCEPTION_OFFSET(rSELF) GET_OPA(a2) # a2 <- AA PREFETCH_INST(2) @@ -3260,7 +3260,7 @@ artMterpAsmInstructionStart = .L_op_nop lw a2, OFF_FP_METHOD(rFP) # a2 <- method move a3, rSELF # a3 <- self PREFETCH_INST(2) # load rINST - JAL(MterpSet32Static) + JAL(MterpSPutU32) bnez v0, MterpException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST @@ -3274,7 +3274,7 @@ artMterpAsmInstructionStart = .L_op_nop * 64-bit SPUT handler. */ /* sput-wide vAA, field@BBBB */ - .extern MterpSet64Static + .extern MterpSPutU64 EXPORT_PC() FETCH(a0, 1) # a0 <- field ref CCCC GET_OPA(a1) # a1 <- AA @@ -3282,7 +3282,7 @@ artMterpAsmInstructionStart = .L_op_nop lw a2, OFF_FP_METHOD(rFP) # a2 <- method move a3, rSELF # a3 <- self PREFETCH_INST(2) # load rINST - JAL(MterpSet64Static) + JAL(MterpSPutU64) bnez v0, MterpException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST @@ -3303,7 +3303,7 @@ artMterpAsmInstructionStart = .L_op_nop move a1, rPC move a2, rINST move a3, rSELF - JAL(MterpSputObject) + JAL(MterpSPutObj) beqz v0, MterpException FETCH_ADVANCE_INST(2) # advance rPC, load rINST GET_INST_OPCODE(t0) # extract opcode from rINST @@ -3327,7 +3327,7 @@ artMterpAsmInstructionStart = .L_op_nop lw a2, OFF_FP_METHOD(rFP) # a2 <- method move a3, rSELF # a3 <- self PREFETCH_INST(2) # load rINST - JAL(MterpSetBooleanStatic) + JAL(MterpSPutU8) bnez v0, MterpException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST @@ -3352,7 +3352,7 @@ artMterpAsmInstructionStart = .L_op_nop lw a2, OFF_FP_METHOD(rFP) # a2 <- method move a3, rSELF # a3 <- self PREFETCH_INST(2) # load rINST - JAL(MterpSetByteStatic) + JAL(MterpSPutI8) bnez v0, MterpException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST @@ -3377,7 +3377,7 @@ artMterpAsmInstructionStart = .L_op_nop lw a2, OFF_FP_METHOD(rFP) # a2 <- method move a3, rSELF # a3 <- self PREFETCH_INST(2) # load rINST - JAL(MterpSetCharStatic) + JAL(MterpSPutU16) bnez v0, MterpException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST @@ -3402,7 +3402,7 @@ artMterpAsmInstructionStart = .L_op_nop lw a2, OFF_FP_METHOD(rFP) # a2 <- method move a3, rSELF # a3 <- self PREFETCH_INST(2) # load rINST - JAL(MterpSetShortStatic) + JAL(MterpSPutI16) bnez v0, MterpException # bail out ADVANCE(2) # advance rPC GET_INST_OPCODE(t0) # extract opcode from rINST diff --git a/runtime/interpreter/mterp/out/mterp_mips64.S b/runtime/interpreter/mterp/out/mterp_mips64.S index f9b270b01e..65616919c9 100644 --- a/runtime/interpreter/mterp/out/mterp_mips64.S +++ b/runtime/interpreter/mterp/out/mterp_mips64.S @@ -2246,14 +2246,14 @@ artMterpAsmInstructionStart = .L_op_nop * * for: iget, iget-object, iget-boolean, iget-byte, iget-char, iget-short */ - .extern artGet32InstanceFromMterp + .extern MterpIGetU32 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B GET_VREG_U a1, a1 # a1 <- fp[B], the object pointer ld a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - jal artGet32InstanceFromMterp + jal MterpIGetU32 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) ext a2, rINST, 8, 4 # a2 <- A PREFETCH_INST 2 @@ -2276,14 +2276,14 @@ artMterpAsmInstructionStart = .L_op_nop * * for: iget-wide */ - .extern artGet64InstanceFromMterp + .extern MterpIGetU64 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B GET_VREG_U a1, a1 # a1 <- fp[B], the object pointer ld a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - jal artGet64InstanceFromMterp + jal MterpIGetU64 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) ext a2, rINST, 8, 4 # a2 <- A PREFETCH_INST 2 @@ -2303,14 +2303,14 @@ artMterpAsmInstructionStart = .L_op_nop * * for: iget, iget-object, iget-boolean, iget-byte, iget-char, iget-short */ - .extern artGetObjInstanceFromMterp + .extern MterpIGetObj EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B GET_VREG_U a1, a1 # a1 <- fp[B], the object pointer ld a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - jal artGetObjInstanceFromMterp + jal MterpIGetObj ld a3, THREAD_EXCEPTION_OFFSET(rSELF) ext a2, rINST, 8, 4 # a2 <- A PREFETCH_INST 2 @@ -2335,14 +2335,14 @@ artMterpAsmInstructionStart = .L_op_nop * * for: iget, iget-object, iget-boolean, iget-byte, iget-char, iget-short */ - .extern artGetBooleanInstanceFromMterp + .extern MterpIGetU8 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B GET_VREG_U a1, a1 # a1 <- fp[B], the object pointer ld a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - jal artGetBooleanInstanceFromMterp + jal MterpIGetU8 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) ext a2, rINST, 8, 4 # a2 <- A PREFETCH_INST 2 @@ -2367,14 +2367,14 @@ artMterpAsmInstructionStart = .L_op_nop * * for: iget, iget-object, iget-boolean, iget-byte, iget-char, iget-short */ - .extern artGetByteInstanceFromMterp + .extern MterpIGetI8 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B GET_VREG_U a1, a1 # a1 <- fp[B], the object pointer ld a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - jal artGetByteInstanceFromMterp + jal MterpIGetI8 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) ext a2, rINST, 8, 4 # a2 <- A PREFETCH_INST 2 @@ -2399,14 +2399,14 @@ artMterpAsmInstructionStart = .L_op_nop * * for: iget, iget-object, iget-boolean, iget-byte, iget-char, iget-short */ - .extern artGetCharInstanceFromMterp + .extern MterpIGetU16 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B GET_VREG_U a1, a1 # a1 <- fp[B], the object pointer ld a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - jal artGetCharInstanceFromMterp + jal MterpIGetU16 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) ext a2, rINST, 8, 4 # a2 <- A PREFETCH_INST 2 @@ -2431,14 +2431,14 @@ artMterpAsmInstructionStart = .L_op_nop * * for: iget, iget-object, iget-boolean, iget-byte, iget-char, iget-short */ - .extern artGetShortInstanceFromMterp + .extern MterpIGetI16 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B GET_VREG_U a1, a1 # a1 <- fp[B], the object pointer ld a2, OFF_FP_METHOD(rFP) # a2 <- referrer move a3, rSELF # a3 <- self - jal artGetShortInstanceFromMterp + jal MterpIGetI16 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) ext a2, rINST, 8, 4 # a2 <- A PREFETCH_INST 2 @@ -2463,7 +2463,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field//CCCC */ - .extern artSet32InstanceFromMterp + .extern MterpIPutU32 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B @@ -2472,7 +2472,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG a2, a2 # a2 <- fp[A] ld a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST 2 - jal artSet32InstanceFromMterp + jal MterpIPutU32 bnez v0, MterpPossibleException # bail out ADVANCE 2 GET_INST_OPCODE v0 # extract opcode from rINST @@ -2483,7 +2483,7 @@ artMterpAsmInstructionStart = .L_op_nop .L_op_iput_wide: /* 0x5a */ /* File: mips64/op_iput_wide.S */ /* iput-wide vA, vB, field//CCCC */ - .extern artSet64InstanceFromMterp + .extern MterpIPutU64 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B @@ -2492,7 +2492,7 @@ artMterpAsmInstructionStart = .L_op_nop dlsa a2, a2, rFP, 2 # a2 <- &fp[A] ld a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST 2 - jal artSet64InstanceFromMterp + jal MterpIPutU64 bnez v0, MterpPossibleException # bail out ADVANCE 2 GET_INST_OPCODE v0 # extract opcode from rINST @@ -2502,13 +2502,13 @@ artMterpAsmInstructionStart = .L_op_nop .balign 128 .L_op_iput_object: /* 0x5b */ /* File: mips64/op_iput_object.S */ - .extern MterpIputObject + .extern MterpIPutObj EXPORT_PC daddu a0, rFP, OFF_FP_SHADOWFRAME move a1, rPC move a2, rINST move a3, rSELF - jal MterpIputObject + jal MterpIPutObj beqzc v0, MterpException FETCH_ADVANCE_INST 2 # advance rPC, load rINST GET_INST_OPCODE v0 # extract opcode from rINST @@ -2525,7 +2525,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field//CCCC */ - .extern artSet8InstanceFromMterp + .extern MterpIPutU8 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B @@ -2534,7 +2534,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG a2, a2 # a2 <- fp[A] ld a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST 2 - jal artSet8InstanceFromMterp + jal MterpIPutU8 bnez v0, MterpPossibleException # bail out ADVANCE 2 GET_INST_OPCODE v0 # extract opcode from rINST @@ -2552,7 +2552,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field//CCCC */ - .extern artSet8InstanceFromMterp + .extern MterpIPutI8 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B @@ -2561,7 +2561,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG a2, a2 # a2 <- fp[A] ld a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST 2 - jal artSet8InstanceFromMterp + jal MterpIPutI8 bnez v0, MterpPossibleException # bail out ADVANCE 2 GET_INST_OPCODE v0 # extract opcode from rINST @@ -2579,7 +2579,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field//CCCC */ - .extern artSet16InstanceFromMterp + .extern MterpIPutU16 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B @@ -2588,7 +2588,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG a2, a2 # a2 <- fp[A] ld a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST 2 - jal artSet16InstanceFromMterp + jal MterpIPutU16 bnez v0, MterpPossibleException # bail out ADVANCE 2 GET_INST_OPCODE v0 # extract opcode from rINST @@ -2606,7 +2606,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: iput, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field//CCCC */ - .extern artSet16InstanceFromMterp + .extern MterpIPutI16 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref CCCC srl a1, rINST, 12 # a1 <- B @@ -2615,7 +2615,7 @@ artMterpAsmInstructionStart = .L_op_nop GET_VREG a2, a2 # a2 <- fp[A] ld a3, OFF_FP_METHOD(rFP) # a3 <- referrer PREFETCH_INST 2 - jal artSet16InstanceFromMterp + jal MterpIPutI16 bnez v0, MterpPossibleException # bail out ADVANCE 2 GET_INST_OPCODE v0 # extract opcode from rINST @@ -2632,12 +2632,12 @@ artMterpAsmInstructionStart = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field//BBBB */ - .extern MterpGet32Static + .extern MterpSGetU32 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB ld a1, OFF_FP_METHOD(rFP) move a2, rSELF - jal MterpGet32Static + jal MterpSGetU32 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) srl a2, rINST, 8 # a2 <- AA @@ -2661,12 +2661,12 @@ artMterpAsmInstructionStart = .L_op_nop * */ /* sget-wide vAA, field//BBBB */ - .extern MterpGet64Static + .extern MterpSGetU64 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB ld a1, OFF_FP_METHOD(rFP) move a2, rSELF - jal MterpGet64Static + jal MterpSGetU64 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) srl a4, rINST, 8 # a4 <- AA bnez a3, MterpException # bail out @@ -2686,12 +2686,12 @@ artMterpAsmInstructionStart = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field//BBBB */ - .extern MterpGetObjStatic + .extern MterpSGetObj EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB ld a1, OFF_FP_METHOD(rFP) move a2, rSELF - jal MterpGetObjStatic + jal MterpSGetObj ld a3, THREAD_EXCEPTION_OFFSET(rSELF) srl a2, rINST, 8 # a2 <- AA @@ -2718,12 +2718,12 @@ artMterpAsmInstructionStart = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field//BBBB */ - .extern MterpGetBooleanStatic + .extern MterpSGetU8 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB ld a1, OFF_FP_METHOD(rFP) move a2, rSELF - jal MterpGetBooleanStatic + jal MterpSGetU8 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) srl a2, rINST, 8 # a2 <- AA and v0, v0, 0xff @@ -2750,12 +2750,12 @@ artMterpAsmInstructionStart = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field//BBBB */ - .extern MterpGetByteStatic + .extern MterpSGetI8 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB ld a1, OFF_FP_METHOD(rFP) move a2, rSELF - jal MterpGetByteStatic + jal MterpSGetI8 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) srl a2, rINST, 8 # a2 <- AA seb v0, v0 @@ -2782,12 +2782,12 @@ artMterpAsmInstructionStart = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field//BBBB */ - .extern MterpGetCharStatic + .extern MterpSGetU16 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB ld a1, OFF_FP_METHOD(rFP) move a2, rSELF - jal MterpGetCharStatic + jal MterpSGetU16 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) srl a2, rINST, 8 # a2 <- AA and v0, v0, 0xffff @@ -2814,12 +2814,12 @@ artMterpAsmInstructionStart = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field//BBBB */ - .extern MterpGetShortStatic + .extern MterpSGetI16 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB ld a1, OFF_FP_METHOD(rFP) move a2, rSELF - jal MterpGetShortStatic + jal MterpSGetI16 ld a3, THREAD_EXCEPTION_OFFSET(rSELF) srl a2, rINST, 8 # a2 <- AA seh v0, v0 @@ -2845,7 +2845,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field//BBBB */ - .extern MterpSet32Static + .extern MterpSPutU32 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB srl a3, rINST, 8 # a3 <- AA @@ -2853,7 +2853,7 @@ artMterpAsmInstructionStart = .L_op_nop ld a2, OFF_FP_METHOD(rFP) move a3, rSELF PREFETCH_INST 2 # Get next inst, but don't advance rPC - jal MterpSet32Static + jal MterpSPutU32 bnezc v0, MterpException # 0 on success ADVANCE 2 # Past exception point - now advance rPC GET_INST_OPCODE v0 # extract opcode from rINST @@ -2868,7 +2868,7 @@ artMterpAsmInstructionStart = .L_op_nop * */ /* sput-wide vAA, field//BBBB */ - .extern MterpSet64Static + .extern MterpSPutU64 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB srl a1, rINST, 8 # a2 <- AA @@ -2876,7 +2876,7 @@ artMterpAsmInstructionStart = .L_op_nop ld a2, OFF_FP_METHOD(rFP) move a3, rSELF PREFETCH_INST 2 # Get next inst, but don't advance rPC - jal MterpSet64Static + jal MterpSPutU64 bnezc v0, MterpException # 0 on success, -1 on failure ADVANCE 2 # Past exception point - now advance rPC GET_INST_OPCODE v0 # extract opcode from rINST @@ -2886,13 +2886,13 @@ artMterpAsmInstructionStart = .L_op_nop .balign 128 .L_op_sput_object: /* 0x69 */ /* File: mips64/op_sput_object.S */ - .extern MterpSputObject + .extern MterpSPutObj EXPORT_PC daddu a0, rFP, OFF_FP_SHADOWFRAME move a1, rPC move a2, rINST move a3, rSELF - jal MterpSputObject + jal MterpSPutObj beqzc v0, MterpException FETCH_ADVANCE_INST 2 # advance rPC, load rINST GET_INST_OPCODE v0 # extract opcode from rINST @@ -2909,7 +2909,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field//BBBB */ - .extern MterpSetBooleanStatic + .extern MterpSPutU8 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB srl a3, rINST, 8 # a3 <- AA @@ -2917,7 +2917,7 @@ artMterpAsmInstructionStart = .L_op_nop ld a2, OFF_FP_METHOD(rFP) move a3, rSELF PREFETCH_INST 2 # Get next inst, but don't advance rPC - jal MterpSetBooleanStatic + jal MterpSPutU8 bnezc v0, MterpException # 0 on success ADVANCE 2 # Past exception point - now advance rPC GET_INST_OPCODE v0 # extract opcode from rINST @@ -2935,7 +2935,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field//BBBB */ - .extern MterpSetByteStatic + .extern MterpSPutI8 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB srl a3, rINST, 8 # a3 <- AA @@ -2943,7 +2943,7 @@ artMterpAsmInstructionStart = .L_op_nop ld a2, OFF_FP_METHOD(rFP) move a3, rSELF PREFETCH_INST 2 # Get next inst, but don't advance rPC - jal MterpSetByteStatic + jal MterpSPutI8 bnezc v0, MterpException # 0 on success ADVANCE 2 # Past exception point - now advance rPC GET_INST_OPCODE v0 # extract opcode from rINST @@ -2961,7 +2961,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field//BBBB */ - .extern MterpSetCharStatic + .extern MterpSPutU16 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB srl a3, rINST, 8 # a3 <- AA @@ -2969,7 +2969,7 @@ artMterpAsmInstructionStart = .L_op_nop ld a2, OFF_FP_METHOD(rFP) move a3, rSELF PREFETCH_INST 2 # Get next inst, but don't advance rPC - jal MterpSetCharStatic + jal MterpSPutU16 bnezc v0, MterpException # 0 on success ADVANCE 2 # Past exception point - now advance rPC GET_INST_OPCODE v0 # extract opcode from rINST @@ -2987,7 +2987,7 @@ artMterpAsmInstructionStart = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field//BBBB */ - .extern MterpSetShortStatic + .extern MterpSPutI16 EXPORT_PC lhu a0, 2(rPC) # a0 <- field ref BBBB srl a3, rINST, 8 # a3 <- AA @@ -2995,7 +2995,7 @@ artMterpAsmInstructionStart = .L_op_nop ld a2, OFF_FP_METHOD(rFP) move a3, rSELF PREFETCH_INST 2 # Get next inst, but don't advance rPC - jal MterpSetShortStatic + jal MterpSPutI16 bnezc v0, MterpException # 0 on success ADVANCE 2 # Past exception point - now advance rPC GET_INST_OPCODE v0 # extract opcode from rINST diff --git a/runtime/interpreter/mterp/out/mterp_x86.S b/runtime/interpreter/mterp/out/mterp_x86.S index ad74b29871..c78eb4942a 100644 --- a/runtime/interpreter/mterp/out/mterp_x86.S +++ b/runtime/interpreter/mterp/out/mterp_x86.S @@ -2132,7 +2132,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer mov rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(artGet32InstanceFromMterp) + call SYMBOL(MterpIGetU32) movl rSELF, %ecx RESTORE_IBASE_FROM_SELF %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) @@ -2165,7 +2165,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer mov rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(artGet64InstanceFromMterp) + call SYMBOL(MterpIGetU64) mov rSELF, %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) jnz MterpException # bail out @@ -2196,7 +2196,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer mov rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(artGetObjInstanceFromMterp) + call SYMBOL(MterpIGetObj) movl rSELF, %ecx RESTORE_IBASE_FROM_SELF %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) @@ -2231,7 +2231,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer mov rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(artGetBooleanInstanceFromMterp) + call SYMBOL(MterpIGetU8) movl rSELF, %ecx RESTORE_IBASE_FROM_SELF %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) @@ -2266,7 +2266,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer mov rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(artGetByteInstanceFromMterp) + call SYMBOL(MterpIGetI8) movl rSELF, %ecx RESTORE_IBASE_FROM_SELF %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) @@ -2301,7 +2301,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer mov rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(artGetCharInstanceFromMterp) + call SYMBOL(MterpIGetU16) movl rSELF, %ecx RESTORE_IBASE_FROM_SELF %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) @@ -2336,7 +2336,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer mov rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(artGetShortInstanceFromMterp) + call SYMBOL(MterpIGetI16) movl rSELF, %ecx RESTORE_IBASE_FROM_SELF %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) @@ -2360,7 +2360,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet32InstanceFromMterp + .extern MterpIPutU32 EXPORT_PC movzwl 2(rPC), %eax # eax<- 0000CCCC movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2373,7 +2373,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # fp[A] movl OFF_FP_METHOD(rFP), %eax movl %eax, OUT_ARG3(%esp) # referrer - call SYMBOL(artSet32InstanceFromMterp) + call SYMBOL(MterpIPutU32) testb %al, %al jnz MterpPossibleException RESTORE_IBASE @@ -2384,7 +2384,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop .L_op_iput_wide: /* 0x5a */ /* File: x86/op_iput_wide.S */ /* iput-wide vA, vB, field@CCCC */ - .extern artSet64InstanceFromMterp + .extern MterpIPutU64 EXPORT_PC movzwl 2(rPC), %eax # eax <- 0000CCCC movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2397,7 +2397,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # &fp[A] movl OFF_FP_METHOD(rFP), %eax movl %eax, OUT_ARG3(%esp) # referrer - call SYMBOL(artSet64InstanceFromMterp) + call SYMBOL(MterpIPutU64) testb %al, %al jnz MterpPossibleException RESTORE_IBASE @@ -2415,7 +2415,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl rINST, OUT_ARG2(%esp) movl rSELF, %eax movl %eax, OUT_ARG3(%esp) - call SYMBOL(MterpIputObject) + call SYMBOL(MterpIPutObj) testb %al, %al jz MterpException RESTORE_IBASE @@ -2432,7 +2432,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet8InstanceFromMterp + .extern MterpIPutU8 EXPORT_PC movzwl 2(rPC), %eax # eax<- 0000CCCC movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2445,7 +2445,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # fp[A] movl OFF_FP_METHOD(rFP), %eax movl %eax, OUT_ARG3(%esp) # referrer - call SYMBOL(artSet8InstanceFromMterp) + call SYMBOL(MterpIPutU8) testb %al, %al jnz MterpPossibleException RESTORE_IBASE @@ -2463,7 +2463,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet8InstanceFromMterp + .extern MterpIPutI8 EXPORT_PC movzwl 2(rPC), %eax # eax<- 0000CCCC movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2476,7 +2476,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # fp[A] movl OFF_FP_METHOD(rFP), %eax movl %eax, OUT_ARG3(%esp) # referrer - call SYMBOL(artSet8InstanceFromMterp) + call SYMBOL(MterpIPutI8) testb %al, %al jnz MterpPossibleException RESTORE_IBASE @@ -2494,7 +2494,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet16InstanceFromMterp + .extern MterpIPutU16 EXPORT_PC movzwl 2(rPC), %eax # eax<- 0000CCCC movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2507,7 +2507,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # fp[A] movl OFF_FP_METHOD(rFP), %eax movl %eax, OUT_ARG3(%esp) # referrer - call SYMBOL(artSet16InstanceFromMterp) + call SYMBOL(MterpIPutU16) testb %al, %al jnz MterpPossibleException RESTORE_IBASE @@ -2525,7 +2525,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet16InstanceFromMterp + .extern MterpIPutI16 EXPORT_PC movzwl 2(rPC), %eax # eax<- 0000CCCC movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2538,7 +2538,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # fp[A] movl OFF_FP_METHOD(rFP), %eax movl %eax, OUT_ARG3(%esp) # referrer - call SYMBOL(artSet16InstanceFromMterp) + call SYMBOL(MterpIPutI16) testb %al, %al jnz MterpPossibleException RESTORE_IBASE @@ -2555,7 +2555,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field@BBBB */ - .extern MterpGet32Static + .extern MterpSGetU32 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2563,7 +2563,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG1(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG2(%esp) # self - call SYMBOL(MterpGet32Static) + call SYMBOL(MterpSGetU32) movl rSELF, %ecx RESTORE_IBASE_FROM_SELF %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) @@ -2584,7 +2584,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * */ /* sget-wide vAA, field@BBBB */ - .extern MterpGet64Static + .extern MterpSGetU64 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2592,7 +2592,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG1(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG2(%esp) # self - call SYMBOL(MterpGet64Static) + call SYMBOL(MterpSGetU64) movl rSELF, %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) jnz MterpException @@ -2612,7 +2612,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field@BBBB */ - .extern MterpGetObjStatic + .extern MterpSGetObj EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2620,7 +2620,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG1(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG2(%esp) # self - call SYMBOL(MterpGetObjStatic) + call SYMBOL(MterpSGetObj) movl rSELF, %ecx RESTORE_IBASE_FROM_SELF %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) @@ -2644,7 +2644,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field@BBBB */ - .extern MterpGetBooleanStatic + .extern MterpSGetU8 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2652,7 +2652,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG1(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG2(%esp) # self - call SYMBOL(MterpGetBooleanStatic) + call SYMBOL(MterpSGetU8) movl rSELF, %ecx RESTORE_IBASE_FROM_SELF %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) @@ -2676,7 +2676,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field@BBBB */ - .extern MterpGetByteStatic + .extern MterpSGetI8 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2684,7 +2684,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG1(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG2(%esp) # self - call SYMBOL(MterpGetByteStatic) + call SYMBOL(MterpSGetI8) movl rSELF, %ecx RESTORE_IBASE_FROM_SELF %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) @@ -2708,7 +2708,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field@BBBB */ - .extern MterpGetCharStatic + .extern MterpSGetU16 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2716,7 +2716,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG1(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG2(%esp) # self - call SYMBOL(MterpGetCharStatic) + call SYMBOL(MterpSGetU16) movl rSELF, %ecx RESTORE_IBASE_FROM_SELF %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) @@ -2740,7 +2740,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short */ /* op vAA, field@BBBB */ - .extern MterpGetShortStatic + .extern MterpSGetI16 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -2748,7 +2748,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG1(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG2(%esp) # self - call SYMBOL(MterpGetShortStatic) + call SYMBOL(MterpSGetI16) movl rSELF, %ecx RESTORE_IBASE_FROM_SELF %ecx cmpl $0, THREAD_EXCEPTION_OFFSET(%ecx) @@ -2771,7 +2771,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field@BBBB */ - .extern MterpSet32Static + .extern MterpSPutU32 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref BBBB @@ -2781,7 +2781,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(MterpSet32Static) + call SYMBOL(MterpSPutU32) testb %al, %al jnz MterpException RESTORE_IBASE @@ -2796,7 +2796,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * */ /* sput-wide vAA, field@BBBB */ - .extern MterpSet64Static + .extern MterpSPutU64 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref BBBB @@ -2806,7 +2806,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(MterpSet64Static) + call SYMBOL(MterpSPutU64) testb %al, %al jnz MterpException RESTORE_IBASE @@ -2824,7 +2824,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl rINST, OUT_ARG2(%esp) movl rSELF, %ecx movl %ecx, OUT_ARG3(%esp) - call SYMBOL(MterpSputObject) + call SYMBOL(MterpSPutObj) testb %al, %al jz MterpException RESTORE_IBASE @@ -2841,7 +2841,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field@BBBB */ - .extern MterpSetBooleanStatic + .extern MterpSPutU8 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref BBBB @@ -2851,7 +2851,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(MterpSetBooleanStatic) + call SYMBOL(MterpSPutU8) testb %al, %al jnz MterpException RESTORE_IBASE @@ -2869,7 +2869,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field@BBBB */ - .extern MterpSetByteStatic + .extern MterpSPutI8 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref BBBB @@ -2879,7 +2879,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(MterpSetByteStatic) + call SYMBOL(MterpSPutI8) testb %al, %al jnz MterpException RESTORE_IBASE @@ -2897,7 +2897,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field@BBBB */ - .extern MterpSetCharStatic + .extern MterpSPutU16 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref BBBB @@ -2907,7 +2907,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(MterpSetCharStatic) + call SYMBOL(MterpSPutU16) testb %al, %al jnz MterpException RESTORE_IBASE @@ -2925,7 +2925,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field@BBBB */ - .extern MterpSetShortStatic + .extern MterpSPutI16 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref BBBB @@ -2935,7 +2935,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop movl %eax, OUT_ARG2(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(MterpSetShortStatic) + call SYMBOL(MterpSPutI16) testb %al, %al jnz MterpException RESTORE_IBASE diff --git a/runtime/interpreter/mterp/out/mterp_x86_64.S b/runtime/interpreter/mterp/out/mterp_x86_64.S index 56d68e6caa..524dce412e 100644 --- a/runtime/interpreter/mterp/out/mterp_x86_64.S +++ b/runtime/interpreter/mterp/out/mterp_x86_64.S @@ -2075,7 +2075,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop GET_VREG OUT_32_ARG1, %rcx # the object pointer movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 - call SYMBOL(artGet32InstanceFromMterp) + call SYMBOL(MterpIGetU32) movq rSELF, %rcx cmpq $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException # bail out @@ -2108,7 +2108,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop GET_VREG OUT_32_ARG1, %rcx # the object pointer movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 - call SYMBOL(artGet64InstanceFromMterp) + call SYMBOL(MterpIGetU64) movq rSELF, %rcx cmpq $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException # bail out @@ -2142,7 +2142,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop GET_VREG OUT_32_ARG1, %rcx # the object pointer movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 - call SYMBOL(artGetObjInstanceFromMterp) + call SYMBOL(MterpIGetObj) movq rSELF, %rcx cmpq $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException # bail out @@ -2176,7 +2176,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop GET_VREG OUT_32_ARG1, %rcx # the object pointer movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 - call SYMBOL(artGetBooleanInstanceFromMterp) + call SYMBOL(MterpIGetU8) movq rSELF, %rcx cmpq $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException # bail out @@ -2210,7 +2210,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop GET_VREG OUT_32_ARG1, %rcx # the object pointer movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 - call SYMBOL(artGetByteInstanceFromMterp) + call SYMBOL(MterpIGetI8) movq rSELF, %rcx cmpq $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException # bail out @@ -2244,7 +2244,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop GET_VREG OUT_32_ARG1, %rcx # the object pointer movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 - call SYMBOL(artGetCharInstanceFromMterp) + call SYMBOL(MterpIGetU16) movq rSELF, %rcx cmpq $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException # bail out @@ -2278,7 +2278,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop GET_VREG OUT_32_ARG1, %rcx # the object pointer movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 - call SYMBOL(artGetShortInstanceFromMterp) + call SYMBOL(MterpIGetI16) movq rSELF, %rcx cmpq $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException # bail out @@ -2305,7 +2305,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet32InstanceFromMterp + .extern MterpIPutU32 EXPORT_PC movzwl 2(rPC), OUT_32_ARG0 # field ref <- 0000CCCC movzbq rINSTbl, %rcx # rcx<- BA @@ -2314,7 +2314,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop andb $0xf, rINSTbl # rINST<- A GET_VREG OUT_32_ARG2, rINSTq # fp[A] movq OFF_FP_METHOD(rFP), OUT_ARG3 # referrer - call SYMBOL(artSet32InstanceFromMterp) + call SYMBOL(MterpIPutU32) testb %al, %al jnz MterpPossibleException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2324,7 +2324,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop .L_op_iput_wide: /* 0x5a */ /* File: x86_64/op_iput_wide.S */ /* iput-wide vA, vB, field@CCCC */ - .extern artSet64InstanceFromMterp + .extern MterpIPutU64 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref CCCC movzbq rINSTbl, %rcx # rcx <- BA @@ -2333,7 +2333,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop andb $0xf, rINSTbl # rINST <- A leaq VREG_ADDRESS(rINSTq), OUT_ARG2 # &fp[A] movq OFF_FP_METHOD(rFP), OUT_ARG3 # referrer - call SYMBOL(artSet64InstanceFromMterp) + call SYMBOL(MterpIPutU64) testb %al, %al jnz MterpPossibleException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2348,7 +2348,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop REFRESH_INST 91 movl rINST, OUT_32_ARG2 movq rSELF, OUT_ARG3 - call SYMBOL(MterpIputObject) + call SYMBOL(MterpIPutObj) testb %al, %al jz MterpException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2364,7 +2364,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet8InstanceFromMterp + .extern MterpIPutU8 EXPORT_PC movzwl 2(rPC), OUT_32_ARG0 # field ref <- 0000CCCC movzbq rINSTbl, %rcx # rcx<- BA @@ -2373,7 +2373,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop andb $0xf, rINSTbl # rINST<- A GET_VREG OUT_32_ARG2, rINSTq # fp[A] movq OFF_FP_METHOD(rFP), OUT_ARG3 # referrer - call SYMBOL(artSet8InstanceFromMterp) + call SYMBOL(MterpIPutU8) testb %al, %al jnz MterpPossibleException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2390,7 +2390,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet8InstanceFromMterp + .extern MterpIPutI8 EXPORT_PC movzwl 2(rPC), OUT_32_ARG0 # field ref <- 0000CCCC movzbq rINSTbl, %rcx # rcx<- BA @@ -2399,7 +2399,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop andb $0xf, rINSTbl # rINST<- A GET_VREG OUT_32_ARG2, rINSTq # fp[A] movq OFF_FP_METHOD(rFP), OUT_ARG3 # referrer - call SYMBOL(artSet8InstanceFromMterp) + call SYMBOL(MterpIPutI8) testb %al, %al jnz MterpPossibleException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2416,7 +2416,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet16InstanceFromMterp + .extern MterpIPutU16 EXPORT_PC movzwl 2(rPC), OUT_32_ARG0 # field ref <- 0000CCCC movzbq rINSTbl, %rcx # rcx<- BA @@ -2425,7 +2425,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop andb $0xf, rINSTbl # rINST<- A GET_VREG OUT_32_ARG2, rINSTq # fp[A] movq OFF_FP_METHOD(rFP), OUT_ARG3 # referrer - call SYMBOL(artSet16InstanceFromMterp) + call SYMBOL(MterpIPutU16) testb %al, %al jnz MterpPossibleException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2442,7 +2442,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern artSet16InstanceFromMterp + .extern MterpIPutI16 EXPORT_PC movzwl 2(rPC), OUT_32_ARG0 # field ref <- 0000CCCC movzbq rINSTbl, %rcx # rcx<- BA @@ -2451,7 +2451,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop andb $0xf, rINSTbl # rINST<- A GET_VREG OUT_32_ARG2, rINSTq # fp[A] movq OFF_FP_METHOD(rFP), OUT_ARG3 # referrer - call SYMBOL(artSet16InstanceFromMterp) + call SYMBOL(MterpIPutI16) testb %al, %al jnz MterpPossibleException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2467,12 +2467,12 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short, sget-wide */ /* op vAA, field@BBBB */ - .extern MterpGet32Static + .extern MterpSGetU32 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref CCCC movq OFF_FP_METHOD(rFP), OUT_ARG1 # referrer movq rSELF, OUT_ARG2 # self - call SYMBOL(MterpGet32Static) + call SYMBOL(MterpSGetU32) movq rSELF, %rcx cmpl $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException @@ -2498,12 +2498,12 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short, sget-wide */ /* op vAA, field@BBBB */ - .extern MterpGet64Static + .extern MterpSGetU64 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref CCCC movq OFF_FP_METHOD(rFP), OUT_ARG1 # referrer movq rSELF, OUT_ARG2 # self - call SYMBOL(MterpGet64Static) + call SYMBOL(MterpSGetU64) movq rSELF, %rcx cmpl $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException @@ -2530,12 +2530,12 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short, sget-wide */ /* op vAA, field@BBBB */ - .extern MterpGetObjStatic + .extern MterpSGetObj EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref CCCC movq OFF_FP_METHOD(rFP), OUT_ARG1 # referrer movq rSELF, OUT_ARG2 # self - call SYMBOL(MterpGetObjStatic) + call SYMBOL(MterpSGetObj) movq rSELF, %rcx cmpl $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException @@ -2562,12 +2562,12 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short, sget-wide */ /* op vAA, field@BBBB */ - .extern MterpGetBooleanStatic + .extern MterpSGetU8 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref CCCC movq OFF_FP_METHOD(rFP), OUT_ARG1 # referrer movq rSELF, OUT_ARG2 # self - call SYMBOL(MterpGetBooleanStatic) + call SYMBOL(MterpSGetU8) movq rSELF, %rcx cmpl $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException @@ -2594,12 +2594,12 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short, sget-wide */ /* op vAA, field@BBBB */ - .extern MterpGetByteStatic + .extern MterpSGetI8 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref CCCC movq OFF_FP_METHOD(rFP), OUT_ARG1 # referrer movq rSELF, OUT_ARG2 # self - call SYMBOL(MterpGetByteStatic) + call SYMBOL(MterpSGetI8) movq rSELF, %rcx cmpl $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException @@ -2626,12 +2626,12 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short, sget-wide */ /* op vAA, field@BBBB */ - .extern MterpGetCharStatic + .extern MterpSGetU16 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref CCCC movq OFF_FP_METHOD(rFP), OUT_ARG1 # referrer movq rSELF, OUT_ARG2 # self - call SYMBOL(MterpGetCharStatic) + call SYMBOL(MterpSGetU16) movq rSELF, %rcx cmpl $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException @@ -2658,12 +2658,12 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sget, sget-object, sget-boolean, sget-byte, sget-char, sget-short, sget-wide */ /* op vAA, field@BBBB */ - .extern MterpGetShortStatic + .extern MterpSGetI16 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref CCCC movq OFF_FP_METHOD(rFP), OUT_ARG1 # referrer movq rSELF, OUT_ARG2 # self - call SYMBOL(MterpGetShortStatic) + call SYMBOL(MterpSGetI16) movq rSELF, %rcx cmpl $0, THREAD_EXCEPTION_OFFSET(%rcx) jnz MterpException @@ -2689,13 +2689,13 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field@BBBB */ - .extern MterpSet32Static + .extern MterpSPutU32 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref BBBB GET_VREG OUT_32_ARG1, rINSTq # fp[AA] movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 # self - call SYMBOL(MterpSet32Static) + call SYMBOL(MterpSPutU32) testb %al, %al jnz MterpException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2709,13 +2709,13 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * */ /* sput-wide vAA, field@BBBB */ - .extern MterpSet64Static + .extern MterpSPutU64 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref BBBB leaq VREG_ADDRESS(rINSTq), OUT_ARG1 # &fp[AA] movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 # self - call SYMBOL(MterpSet64Static) + call SYMBOL(MterpSPutU64) testb %al, %al jnz MterpException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2730,7 +2730,7 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop REFRESH_INST 105 movq rINSTq, OUT_ARG2 movq rSELF, OUT_ARG3 - call SYMBOL(MterpSputObject) + call SYMBOL(MterpSPutObj) testb %al, %al jz MterpException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2746,13 +2746,13 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field@BBBB */ - .extern MterpSetBooleanStatic + .extern MterpSPutU8 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref BBBB GET_VREG OUT_32_ARG1, rINSTq # fp[AA] movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 # self - call SYMBOL(MterpSetBooleanStatic) + call SYMBOL(MterpSPutU8) testb %al, %al jnz MterpException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2769,13 +2769,13 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field@BBBB */ - .extern MterpSetByteStatic + .extern MterpSPutI8 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref BBBB GET_VREG OUT_32_ARG1, rINSTq # fp[AA] movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 # self - call SYMBOL(MterpSetByteStatic) + call SYMBOL(MterpSPutI8) testb %al, %al jnz MterpException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2792,13 +2792,13 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field@BBBB */ - .extern MterpSetCharStatic + .extern MterpSPutU16 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref BBBB GET_VREG OUT_32_ARG1, rINSTq # fp[AA] movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 # self - call SYMBOL(MterpSetCharStatic) + call SYMBOL(MterpSPutU16) testb %al, %al jnz MterpException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 @@ -2815,13 +2815,13 @@ SYMBOL(artMterpAsmInstructionStart) = .L_op_nop * for: sput, sput-boolean, sput-byte, sput-char, sput-short */ /* op vAA, field@BBBB */ - .extern MterpSetShortStatic + .extern MterpSPutI16 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref BBBB GET_VREG OUT_32_ARG1, rINSTq # fp[AA] movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 # self - call SYMBOL(MterpSetShortStatic) + call SYMBOL(MterpSPutI16) testb %al, %al jnz MterpException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 diff --git a/runtime/interpreter/mterp/x86/op_iget.S b/runtime/interpreter/mterp/x86/op_iget.S index 219463b646..0af1becb24 100644 --- a/runtime/interpreter/mterp/x86/op_iget.S +++ b/runtime/interpreter/mterp/x86/op_iget.S @@ -1,4 +1,4 @@ -%default { "is_object":"0", "helper":"artGet32InstanceFromMterp"} +%default { "is_object":"0", "helper":"MterpIGetU32"} /* * General instance field get. * diff --git a/runtime/interpreter/mterp/x86/op_iget_boolean.S b/runtime/interpreter/mterp/x86/op_iget_boolean.S index 4ab2afcd38..ddccc41cda 100644 --- a/runtime/interpreter/mterp/x86/op_iget_boolean.S +++ b/runtime/interpreter/mterp/x86/op_iget_boolean.S @@ -1 +1 @@ -%include "x86/op_iget.S" { "helper":"artGetBooleanInstanceFromMterp" } +%include "x86/op_iget.S" { "helper":"MterpIGetU8" } diff --git a/runtime/interpreter/mterp/x86/op_iget_byte.S b/runtime/interpreter/mterp/x86/op_iget_byte.S index bb282d4648..cd46d3de08 100644 --- a/runtime/interpreter/mterp/x86/op_iget_byte.S +++ b/runtime/interpreter/mterp/x86/op_iget_byte.S @@ -1 +1 @@ -%include "x86/op_iget.S" { "helper":"artGetByteInstanceFromMterp" } +%include "x86/op_iget.S" { "helper":"MterpIGetI8" } diff --git a/runtime/interpreter/mterp/x86/op_iget_char.S b/runtime/interpreter/mterp/x86/op_iget_char.S index a13203bb81..99697349ae 100644 --- a/runtime/interpreter/mterp/x86/op_iget_char.S +++ b/runtime/interpreter/mterp/x86/op_iget_char.S @@ -1 +1 @@ -%include "x86/op_iget.S" { "helper":"artGetCharInstanceFromMterp" } +%include "x86/op_iget.S" { "helper":"MterpIGetU16" } diff --git a/runtime/interpreter/mterp/x86/op_iget_object.S b/runtime/interpreter/mterp/x86/op_iget_object.S index 79d5e5fd94..3d421fcf7f 100644 --- a/runtime/interpreter/mterp/x86/op_iget_object.S +++ b/runtime/interpreter/mterp/x86/op_iget_object.S @@ -1 +1 @@ -%include "x86/op_iget.S" { "is_object":"1", "helper":"artGetObjInstanceFromMterp" } +%include "x86/op_iget.S" { "is_object":"1", "helper":"MterpIGetObj" } diff --git a/runtime/interpreter/mterp/x86/op_iget_short.S b/runtime/interpreter/mterp/x86/op_iget_short.S index 8fc18a570f..c7477f5db3 100644 --- a/runtime/interpreter/mterp/x86/op_iget_short.S +++ b/runtime/interpreter/mterp/x86/op_iget_short.S @@ -1 +1 @@ -%include "x86/op_iget.S" { "helper":"artGetShortInstanceFromMterp" } +%include "x86/op_iget.S" { "helper":"MterpIGetI16" } diff --git a/runtime/interpreter/mterp/x86/op_iget_wide.S b/runtime/interpreter/mterp/x86/op_iget_wide.S index b111b29587..da27df952b 100644 --- a/runtime/interpreter/mterp/x86/op_iget_wide.S +++ b/runtime/interpreter/mterp/x86/op_iget_wide.S @@ -14,7 +14,7 @@ movl %eax, OUT_ARG2(%esp) # referrer mov rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(artGet64InstanceFromMterp) + call SYMBOL(MterpIGetU64) mov rSELF, %ecx cmpl $$0, THREAD_EXCEPTION_OFFSET(%ecx) jnz MterpException # bail out diff --git a/runtime/interpreter/mterp/x86/op_iput.S b/runtime/interpreter/mterp/x86/op_iput.S index c847e2dc88..4c6603a572 100644 --- a/runtime/interpreter/mterp/x86/op_iput.S +++ b/runtime/interpreter/mterp/x86/op_iput.S @@ -1,11 +1,11 @@ -%default { "handler":"artSet32InstanceFromMterp" } +%default { "helper":"MterpIPutU32" } /* * General 32-bit instance field put. * * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern $handler + .extern $helper EXPORT_PC movzwl 2(rPC), %eax # eax<- 0000CCCC movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -18,7 +18,7 @@ movl %eax, OUT_ARG2(%esp) # fp[A] movl OFF_FP_METHOD(rFP), %eax movl %eax, OUT_ARG3(%esp) # referrer - call SYMBOL($handler) + call SYMBOL($helper) testb %al, %al jnz MterpPossibleException RESTORE_IBASE diff --git a/runtime/interpreter/mterp/x86/op_iput_boolean.S b/runtime/interpreter/mterp/x86/op_iput_boolean.S index 11cab8880f..fdd530374e 100644 --- a/runtime/interpreter/mterp/x86/op_iput_boolean.S +++ b/runtime/interpreter/mterp/x86/op_iput_boolean.S @@ -1 +1 @@ -%include "x86/op_iput.S" { "handler":"artSet8InstanceFromMterp" } +%include "x86/op_iput.S" { "helper":"MterpIPutU8" } diff --git a/runtime/interpreter/mterp/x86/op_iput_byte.S b/runtime/interpreter/mterp/x86/op_iput_byte.S index 11cab8880f..b81850c538 100644 --- a/runtime/interpreter/mterp/x86/op_iput_byte.S +++ b/runtime/interpreter/mterp/x86/op_iput_byte.S @@ -1 +1 @@ -%include "x86/op_iput.S" { "handler":"artSet8InstanceFromMterp" } +%include "x86/op_iput.S" { "helper":"MterpIPutI8" } diff --git a/runtime/interpreter/mterp/x86/op_iput_char.S b/runtime/interpreter/mterp/x86/op_iput_char.S index abbf2bdc6e..dde385371e 100644 --- a/runtime/interpreter/mterp/x86/op_iput_char.S +++ b/runtime/interpreter/mterp/x86/op_iput_char.S @@ -1 +1 @@ -%include "x86/op_iput.S" { "handler":"artSet16InstanceFromMterp" } +%include "x86/op_iput.S" { "helper":"MterpIPutU16" } diff --git a/runtime/interpreter/mterp/x86/op_iput_object.S b/runtime/interpreter/mterp/x86/op_iput_object.S index e0136970b0..56e026e40a 100644 --- a/runtime/interpreter/mterp/x86/op_iput_object.S +++ b/runtime/interpreter/mterp/x86/op_iput_object.S @@ -6,7 +6,7 @@ movl rINST, OUT_ARG2(%esp) movl rSELF, %eax movl %eax, OUT_ARG3(%esp) - call SYMBOL(MterpIputObject) + call SYMBOL(MterpIPutObj) testb %al, %al jz MterpException RESTORE_IBASE diff --git a/runtime/interpreter/mterp/x86/op_iput_short.S b/runtime/interpreter/mterp/x86/op_iput_short.S index abbf2bdc6e..130e875bb2 100644 --- a/runtime/interpreter/mterp/x86/op_iput_short.S +++ b/runtime/interpreter/mterp/x86/op_iput_short.S @@ -1 +1 @@ -%include "x86/op_iput.S" { "handler":"artSet16InstanceFromMterp" } +%include "x86/op_iput.S" { "helper":"MterpIPutI16" } diff --git a/runtime/interpreter/mterp/x86/op_iput_wide.S b/runtime/interpreter/mterp/x86/op_iput_wide.S index 122eecf43f..ea22b919c3 100644 --- a/runtime/interpreter/mterp/x86/op_iput_wide.S +++ b/runtime/interpreter/mterp/x86/op_iput_wide.S @@ -1,5 +1,5 @@ /* iput-wide vA, vB, field@CCCC */ - .extern artSet64InstanceFromMterp + .extern MterpIPutU64 EXPORT_PC movzwl 2(rPC), %eax # eax <- 0000CCCC movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -12,7 +12,7 @@ movl %eax, OUT_ARG2(%esp) # &fp[A] movl OFF_FP_METHOD(rFP), %eax movl %eax, OUT_ARG3(%esp) # referrer - call SYMBOL(artSet64InstanceFromMterp) + call SYMBOL(MterpIPutU64) testb %al, %al jnz MterpPossibleException RESTORE_IBASE diff --git a/runtime/interpreter/mterp/x86/op_sget.S b/runtime/interpreter/mterp/x86/op_sget.S index 6e42d323e6..66c7b0bac5 100644 --- a/runtime/interpreter/mterp/x86/op_sget.S +++ b/runtime/interpreter/mterp/x86/op_sget.S @@ -1,4 +1,4 @@ -%default { "is_object":"0", "helper":"MterpGet32Static" } +%default { "is_object":"0", "helper":"MterpSGetU32" } /* * General SGET handler wrapper. * diff --git a/runtime/interpreter/mterp/x86/op_sget_boolean.S b/runtime/interpreter/mterp/x86/op_sget_boolean.S index 5fa2bf0cfc..3936eeae45 100644 --- a/runtime/interpreter/mterp/x86/op_sget_boolean.S +++ b/runtime/interpreter/mterp/x86/op_sget_boolean.S @@ -1 +1 @@ -%include "x86/op_sget.S" {"helper":"MterpGetBooleanStatic"} +%include "x86/op_sget.S" {"helper":"MterpSGetU8"} diff --git a/runtime/interpreter/mterp/x86/op_sget_byte.S b/runtime/interpreter/mterp/x86/op_sget_byte.S index ef812f118e..967586d944 100644 --- a/runtime/interpreter/mterp/x86/op_sget_byte.S +++ b/runtime/interpreter/mterp/x86/op_sget_byte.S @@ -1 +1 @@ -%include "x86/op_sget.S" {"helper":"MterpGetByteStatic"} +%include "x86/op_sget.S" {"helper":"MterpSGetI8"} diff --git a/runtime/interpreter/mterp/x86/op_sget_char.S b/runtime/interpreter/mterp/x86/op_sget_char.S index 3bc34ef338..b706f18638 100644 --- a/runtime/interpreter/mterp/x86/op_sget_char.S +++ b/runtime/interpreter/mterp/x86/op_sget_char.S @@ -1 +1 @@ -%include "x86/op_sget.S" {"helper":"MterpGetCharStatic"} +%include "x86/op_sget.S" {"helper":"MterpSGetU16"} diff --git a/runtime/interpreter/mterp/x86/op_sget_object.S b/runtime/interpreter/mterp/x86/op_sget_object.S index b829e75f30..eac8836534 100644 --- a/runtime/interpreter/mterp/x86/op_sget_object.S +++ b/runtime/interpreter/mterp/x86/op_sget_object.S @@ -1 +1 @@ -%include "x86/op_sget.S" {"is_object":"1", "helper":"MterpGetObjStatic"} +%include "x86/op_sget.S" {"is_object":"1", "helper":"MterpSGetObj"} diff --git a/runtime/interpreter/mterp/x86/op_sget_short.S b/runtime/interpreter/mterp/x86/op_sget_short.S index 449cf6f918..ee058a6016 100644 --- a/runtime/interpreter/mterp/x86/op_sget_short.S +++ b/runtime/interpreter/mterp/x86/op_sget_short.S @@ -1 +1 @@ -%include "x86/op_sget.S" {"helper":"MterpGetShortStatic"} +%include "x86/op_sget.S" {"helper":"MterpSGetI16"} diff --git a/runtime/interpreter/mterp/x86/op_sget_wide.S b/runtime/interpreter/mterp/x86/op_sget_wide.S index a605bcf2e5..994cc3aebb 100644 --- a/runtime/interpreter/mterp/x86/op_sget_wide.S +++ b/runtime/interpreter/mterp/x86/op_sget_wide.S @@ -3,7 +3,7 @@ * */ /* sget-wide vAA, field@BBBB */ - .extern MterpGet64Static + .extern MterpSGetU64 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref CCCC @@ -11,7 +11,7 @@ movl %eax, OUT_ARG1(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG2(%esp) # self - call SYMBOL(MterpGet64Static) + call SYMBOL(MterpSGetU64) movl rSELF, %ecx cmpl $$0, THREAD_EXCEPTION_OFFSET(%ecx) jnz MterpException diff --git a/runtime/interpreter/mterp/x86/op_sput.S b/runtime/interpreter/mterp/x86/op_sput.S index 99f6088982..e99e7a7239 100644 --- a/runtime/interpreter/mterp/x86/op_sput.S +++ b/runtime/interpreter/mterp/x86/op_sput.S @@ -1,4 +1,4 @@ -%default { "helper":"MterpSet32Static"} +%default { "helper":"MterpSPutU32"} /* * General SPUT handler wrapper. * diff --git a/runtime/interpreter/mterp/x86/op_sput_boolean.S b/runtime/interpreter/mterp/x86/op_sput_boolean.S index a7fffda1db..c6aa7c4cd1 100644 --- a/runtime/interpreter/mterp/x86/op_sput_boolean.S +++ b/runtime/interpreter/mterp/x86/op_sput_boolean.S @@ -1 +1 @@ -%include "x86/op_sput.S" {"helper":"MterpSetBooleanStatic"} +%include "x86/op_sput.S" {"helper":"MterpSPutU8"} diff --git a/runtime/interpreter/mterp/x86/op_sput_byte.S b/runtime/interpreter/mterp/x86/op_sput_byte.S index 3a5ff9267d..fd504a8023 100644 --- a/runtime/interpreter/mterp/x86/op_sput_byte.S +++ b/runtime/interpreter/mterp/x86/op_sput_byte.S @@ -1 +1 @@ -%include "x86/op_sput.S" {"helper":"MterpSetByteStatic"} +%include "x86/op_sput.S" {"helper":"MterpSPutI8"} diff --git a/runtime/interpreter/mterp/x86/op_sput_char.S b/runtime/interpreter/mterp/x86/op_sput_char.S index 565cc2aa0f..b4d0997737 100644 --- a/runtime/interpreter/mterp/x86/op_sput_char.S +++ b/runtime/interpreter/mterp/x86/op_sput_char.S @@ -1 +1 @@ -%include "x86/op_sput.S" {"helper":"MterpSetCharStatic"} +%include "x86/op_sput.S" {"helper":"MterpSPutU16"} diff --git a/runtime/interpreter/mterp/x86/op_sput_object.S b/runtime/interpreter/mterp/x86/op_sput_object.S index 0db517723b..941b07201e 100644 --- a/runtime/interpreter/mterp/x86/op_sput_object.S +++ b/runtime/interpreter/mterp/x86/op_sput_object.S @@ -6,7 +6,7 @@ movl rINST, OUT_ARG2(%esp) movl rSELF, %ecx movl %ecx, OUT_ARG3(%esp) - call SYMBOL(MterpSputObject) + call SYMBOL(MterpSPutObj) testb %al, %al jz MterpException RESTORE_IBASE diff --git a/runtime/interpreter/mterp/x86/op_sput_short.S b/runtime/interpreter/mterp/x86/op_sput_short.S index 85c344165e..eba01bdfd0 100644 --- a/runtime/interpreter/mterp/x86/op_sput_short.S +++ b/runtime/interpreter/mterp/x86/op_sput_short.S @@ -1 +1 @@ -%include "x86/op_sput.S" {"helper":"MterpSetShortStatic"} +%include "x86/op_sput.S" {"helper":"MterpSPutI16"} diff --git a/runtime/interpreter/mterp/x86/op_sput_wide.S b/runtime/interpreter/mterp/x86/op_sput_wide.S index 8cc7e28554..f58150706e 100644 --- a/runtime/interpreter/mterp/x86/op_sput_wide.S +++ b/runtime/interpreter/mterp/x86/op_sput_wide.S @@ -3,7 +3,7 @@ * */ /* sput-wide vAA, field@BBBB */ - .extern MterpSet64Static + .extern MterpSPutU64 EXPORT_PC movzwl 2(rPC), %eax movl %eax, OUT_ARG0(%esp) # field ref BBBB @@ -13,7 +13,7 @@ movl %eax, OUT_ARG2(%esp) # referrer movl rSELF, %ecx movl %ecx, OUT_ARG3(%esp) # self - call SYMBOL(MterpSet64Static) + call SYMBOL(MterpSPutU64) testb %al, %al jnz MterpException RESTORE_IBASE diff --git a/runtime/interpreter/mterp/x86_64/op_iget.S b/runtime/interpreter/mterp/x86_64/op_iget.S index ffc14b5d22..5c6cab6acb 100644 --- a/runtime/interpreter/mterp/x86_64/op_iget.S +++ b/runtime/interpreter/mterp/x86_64/op_iget.S @@ -1,4 +1,4 @@ -%default { "is_object":"0", "helper":"artGet32InstanceFromMterp", "wide":"0"} +%default { "is_object":"0", "helper":"MterpIGetU32", "wide":"0"} /* * General instance field get. * diff --git a/runtime/interpreter/mterp/x86_64/op_iget_boolean.S b/runtime/interpreter/mterp/x86_64/op_iget_boolean.S index 1379d53cfe..18e9264926 100644 --- a/runtime/interpreter/mterp/x86_64/op_iget_boolean.S +++ b/runtime/interpreter/mterp/x86_64/op_iget_boolean.S @@ -1 +1 @@ -%include "x86_64/op_iget.S" { "helper":"artGetBooleanInstanceFromMterp" } +%include "x86_64/op_iget.S" { "helper":"MterpIGetU8" } diff --git a/runtime/interpreter/mterp/x86_64/op_iget_byte.S b/runtime/interpreter/mterp/x86_64/op_iget_byte.S index 93047ec99c..bec0ad526c 100644 --- a/runtime/interpreter/mterp/x86_64/op_iget_byte.S +++ b/runtime/interpreter/mterp/x86_64/op_iget_byte.S @@ -1 +1 @@ -%include "x86_64/op_iget.S" { "helper":"artGetByteInstanceFromMterp" } +%include "x86_64/op_iget.S" { "helper":"MterpIGetI8" } diff --git a/runtime/interpreter/mterp/x86_64/op_iget_char.S b/runtime/interpreter/mterp/x86_64/op_iget_char.S index 239f0d0bd7..5e22b88129 100644 --- a/runtime/interpreter/mterp/x86_64/op_iget_char.S +++ b/runtime/interpreter/mterp/x86_64/op_iget_char.S @@ -1 +1 @@ -%include "x86_64/op_iget.S" { "helper":"artGetCharInstanceFromMterp" } +%include "x86_64/op_iget.S" { "helper":"MterpIGetU16" } diff --git a/runtime/interpreter/mterp/x86_64/op_iget_object.S b/runtime/interpreter/mterp/x86_64/op_iget_object.S index 2104d2c744..bcef1d2c25 100644 --- a/runtime/interpreter/mterp/x86_64/op_iget_object.S +++ b/runtime/interpreter/mterp/x86_64/op_iget_object.S @@ -1 +1 @@ -%include "x86_64/op_iget.S" { "is_object":"1", "helper":"artGetObjInstanceFromMterp" } +%include "x86_64/op_iget.S" { "is_object":"1", "helper":"MterpIGetObj" } diff --git a/runtime/interpreter/mterp/x86_64/op_iget_short.S b/runtime/interpreter/mterp/x86_64/op_iget_short.S index 3525effe75..14c49f7711 100644 --- a/runtime/interpreter/mterp/x86_64/op_iget_short.S +++ b/runtime/interpreter/mterp/x86_64/op_iget_short.S @@ -1 +1 @@ -%include "x86_64/op_iget.S" { "helper":"artGetShortInstanceFromMterp" } +%include "x86_64/op_iget.S" { "helper":"MterpIGetI16" } diff --git a/runtime/interpreter/mterp/x86_64/op_iget_wide.S b/runtime/interpreter/mterp/x86_64/op_iget_wide.S index 706c44121e..d9d174400c 100644 --- a/runtime/interpreter/mterp/x86_64/op_iget_wide.S +++ b/runtime/interpreter/mterp/x86_64/op_iget_wide.S @@ -1 +1 @@ -%include "x86_64/op_iget.S" { "helper":"artGet64InstanceFromMterp", "wide":"1" } +%include "x86_64/op_iget.S" { "helper":"MterpIGetU64", "wide":"1" } diff --git a/runtime/interpreter/mterp/x86_64/op_iput.S b/runtime/interpreter/mterp/x86_64/op_iput.S index 6b7cb1cc84..12affdbe84 100644 --- a/runtime/interpreter/mterp/x86_64/op_iput.S +++ b/runtime/interpreter/mterp/x86_64/op_iput.S @@ -1,11 +1,11 @@ -%default { "handler":"artSet32InstanceFromMterp"} +%default { "helper":"MterpIPutU32"} /* * General 32-bit instance field put. * * for: iput, iput-object, iput-boolean, iput-byte, iput-char, iput-short */ /* op vA, vB, field@CCCC */ - .extern $handler + .extern $helper EXPORT_PC movzwl 2(rPC), OUT_32_ARG0 # field ref <- 0000CCCC movzbq rINSTbl, %rcx # rcx<- BA @@ -14,7 +14,7 @@ andb $$0xf, rINSTbl # rINST<- A GET_VREG OUT_32_ARG2, rINSTq # fp[A] movq OFF_FP_METHOD(rFP), OUT_ARG3 # referrer - call SYMBOL($handler) + call SYMBOL($helper) testb %al, %al jnz MterpPossibleException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 diff --git a/runtime/interpreter/mterp/x86_64/op_iput_boolean.S b/runtime/interpreter/mterp/x86_64/op_iput_boolean.S index cb4b1cde45..06bbd704d7 100644 --- a/runtime/interpreter/mterp/x86_64/op_iput_boolean.S +++ b/runtime/interpreter/mterp/x86_64/op_iput_boolean.S @@ -1 +1 @@ -%include "x86_64/op_iput.S" { "handler":"artSet8InstanceFromMterp" } +%include "x86_64/op_iput.S" { "helper":"MterpIPutU8" } diff --git a/runtime/interpreter/mterp/x86_64/op_iput_byte.S b/runtime/interpreter/mterp/x86_64/op_iput_byte.S index cb4b1cde45..53f9008eb5 100644 --- a/runtime/interpreter/mterp/x86_64/op_iput_byte.S +++ b/runtime/interpreter/mterp/x86_64/op_iput_byte.S @@ -1 +1 @@ -%include "x86_64/op_iput.S" { "handler":"artSet8InstanceFromMterp" } +%include "x86_64/op_iput.S" { "helper":"MterpIPutI8" } diff --git a/runtime/interpreter/mterp/x86_64/op_iput_char.S b/runtime/interpreter/mterp/x86_64/op_iput_char.S index b4e147cf5e..4736f5e9d4 100644 --- a/runtime/interpreter/mterp/x86_64/op_iput_char.S +++ b/runtime/interpreter/mterp/x86_64/op_iput_char.S @@ -1 +1 @@ -%include "x86_64/op_iput.S" { "handler":"artSet16InstanceFromMterp" } +%include "x86_64/op_iput.S" { "helper":"MterpIPutU16" } diff --git a/runtime/interpreter/mterp/x86_64/op_iput_object.S b/runtime/interpreter/mterp/x86_64/op_iput_object.S index 828712d8ba..22648cdde7 100644 --- a/runtime/interpreter/mterp/x86_64/op_iput_object.S +++ b/runtime/interpreter/mterp/x86_64/op_iput_object.S @@ -4,7 +4,7 @@ REFRESH_INST ${opnum} movl rINST, OUT_32_ARG2 movq rSELF, OUT_ARG3 - call SYMBOL(MterpIputObject) + call SYMBOL(MterpIPutObj) testb %al, %al jz MterpException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 diff --git a/runtime/interpreter/mterp/x86_64/op_iput_short.S b/runtime/interpreter/mterp/x86_64/op_iput_short.S index b4e147cf5e..dca5735963 100644 --- a/runtime/interpreter/mterp/x86_64/op_iput_short.S +++ b/runtime/interpreter/mterp/x86_64/op_iput_short.S @@ -1 +1 @@ -%include "x86_64/op_iput.S" { "handler":"artSet16InstanceFromMterp" } +%include "x86_64/op_iput.S" { "helper":"MterpIPutI16" } diff --git a/runtime/interpreter/mterp/x86_64/op_iput_wide.S b/runtime/interpreter/mterp/x86_64/op_iput_wide.S index e59717b846..4f8c47c1e6 100644 --- a/runtime/interpreter/mterp/x86_64/op_iput_wide.S +++ b/runtime/interpreter/mterp/x86_64/op_iput_wide.S @@ -1,5 +1,5 @@ /* iput-wide vA, vB, field@CCCC */ - .extern artSet64InstanceFromMterp + .extern MterpIPutU64 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref CCCC movzbq rINSTbl, %rcx # rcx <- BA @@ -8,7 +8,7 @@ andb $$0xf, rINSTbl # rINST <- A leaq VREG_ADDRESS(rINSTq), OUT_ARG2 # &fp[A] movq OFF_FP_METHOD(rFP), OUT_ARG3 # referrer - call SYMBOL(artSet64InstanceFromMterp) + call SYMBOL(MterpIPutU64) testb %al, %al jnz MterpPossibleException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 diff --git a/runtime/interpreter/mterp/x86_64/op_sget.S b/runtime/interpreter/mterp/x86_64/op_sget.S index e996c77801..c15ac1e280 100644 --- a/runtime/interpreter/mterp/x86_64/op_sget.S +++ b/runtime/interpreter/mterp/x86_64/op_sget.S @@ -1,4 +1,4 @@ -%default { "is_object":"0", "helper":"MterpGet32Static", "wide":"0" } +%default { "is_object":"0", "helper":"MterpSGetU32", "wide":"0" } /* * General SGET handler wrapper. * diff --git a/runtime/interpreter/mterp/x86_64/op_sget_boolean.S b/runtime/interpreter/mterp/x86_64/op_sget_boolean.S index ee772ad4e1..e5a4e41995 100644 --- a/runtime/interpreter/mterp/x86_64/op_sget_boolean.S +++ b/runtime/interpreter/mterp/x86_64/op_sget_boolean.S @@ -1 +1 @@ -%include "x86_64/op_sget.S" {"helper":"MterpGetBooleanStatic"} +%include "x86_64/op_sget.S" {"helper":"MterpSGetU8"} diff --git a/runtime/interpreter/mterp/x86_64/op_sget_byte.S b/runtime/interpreter/mterp/x86_64/op_sget_byte.S index f65ea4951e..4602f7da53 100644 --- a/runtime/interpreter/mterp/x86_64/op_sget_byte.S +++ b/runtime/interpreter/mterp/x86_64/op_sget_byte.S @@ -1 +1 @@ -%include "x86_64/op_sget.S" {"helper":"MterpGetByteStatic"} +%include "x86_64/op_sget.S" {"helper":"MterpSGetI8"} diff --git a/runtime/interpreter/mterp/x86_64/op_sget_char.S b/runtime/interpreter/mterp/x86_64/op_sget_char.S index 3972551bec..a094a542de 100644 --- a/runtime/interpreter/mterp/x86_64/op_sget_char.S +++ b/runtime/interpreter/mterp/x86_64/op_sget_char.S @@ -1 +1 @@ -%include "x86_64/op_sget.S" {"helper":"MterpGetCharStatic"} +%include "x86_64/op_sget.S" {"helper":"MterpSGetU16"} diff --git a/runtime/interpreter/mterp/x86_64/op_sget_object.S b/runtime/interpreter/mterp/x86_64/op_sget_object.S index a0bbfd8d35..94597b187c 100644 --- a/runtime/interpreter/mterp/x86_64/op_sget_object.S +++ b/runtime/interpreter/mterp/x86_64/op_sget_object.S @@ -1 +1 @@ -%include "x86_64/op_sget.S" {"is_object":"1", "helper":"MterpGetObjStatic"} +%include "x86_64/op_sget.S" {"is_object":"1", "helper":"MterpSGetObj"} diff --git a/runtime/interpreter/mterp/x86_64/op_sget_short.S b/runtime/interpreter/mterp/x86_64/op_sget_short.S index df212dc5c9..dee5c247b9 100644 --- a/runtime/interpreter/mterp/x86_64/op_sget_short.S +++ b/runtime/interpreter/mterp/x86_64/op_sget_short.S @@ -1 +1 @@ -%include "x86_64/op_sget.S" {"helper":"MterpGetShortStatic"} +%include "x86_64/op_sget.S" {"helper":"MterpSGetI16"} diff --git a/runtime/interpreter/mterp/x86_64/op_sget_wide.S b/runtime/interpreter/mterp/x86_64/op_sget_wide.S index 1e98e28a92..65ddb8a09c 100644 --- a/runtime/interpreter/mterp/x86_64/op_sget_wide.S +++ b/runtime/interpreter/mterp/x86_64/op_sget_wide.S @@ -1 +1 @@ -%include "x86_64/op_sget.S" {"helper":"MterpGet64Static", "wide":"1"} +%include "x86_64/op_sget.S" {"helper":"MterpSGetU64", "wide":"1"} diff --git a/runtime/interpreter/mterp/x86_64/op_sput.S b/runtime/interpreter/mterp/x86_64/op_sput.S index 9705619900..9a33d521b9 100644 --- a/runtime/interpreter/mterp/x86_64/op_sput.S +++ b/runtime/interpreter/mterp/x86_64/op_sput.S @@ -1,4 +1,4 @@ -%default { "helper":"MterpSet32Static"} +%default { "helper":"MterpSPutU32"} /* * General SPUT handler wrapper. * diff --git a/runtime/interpreter/mterp/x86_64/op_sput_boolean.S b/runtime/interpreter/mterp/x86_64/op_sput_boolean.S index 8bf4a62328..ea9acbfdc7 100644 --- a/runtime/interpreter/mterp/x86_64/op_sput_boolean.S +++ b/runtime/interpreter/mterp/x86_64/op_sput_boolean.S @@ -1 +1 @@ -%include "x86_64/op_sput.S" {"helper":"MterpSetBooleanStatic"} +%include "x86_64/op_sput.S" {"helper":"MterpSPutU8"} diff --git a/runtime/interpreter/mterp/x86_64/op_sput_byte.S b/runtime/interpreter/mterp/x86_64/op_sput_byte.S index 5bb26ebed5..62c9e205a1 100644 --- a/runtime/interpreter/mterp/x86_64/op_sput_byte.S +++ b/runtime/interpreter/mterp/x86_64/op_sput_byte.S @@ -1 +1 @@ -%include "x86_64/op_sput.S" {"helper":"MterpSetByteStatic"} +%include "x86_64/op_sput.S" {"helper":"MterpSPutI8"} diff --git a/runtime/interpreter/mterp/x86_64/op_sput_char.S b/runtime/interpreter/mterp/x86_64/op_sput_char.S index 42b244e2bb..ab0196e027 100644 --- a/runtime/interpreter/mterp/x86_64/op_sput_char.S +++ b/runtime/interpreter/mterp/x86_64/op_sput_char.S @@ -1 +1 @@ -%include "x86_64/op_sput.S" {"helper":"MterpSetCharStatic"} +%include "x86_64/op_sput.S" {"helper":"MterpSPutU16"} diff --git a/runtime/interpreter/mterp/x86_64/op_sput_object.S b/runtime/interpreter/mterp/x86_64/op_sput_object.S index eb5a37673e..8a47074ec3 100644 --- a/runtime/interpreter/mterp/x86_64/op_sput_object.S +++ b/runtime/interpreter/mterp/x86_64/op_sput_object.S @@ -4,7 +4,7 @@ REFRESH_INST ${opnum} movq rINSTq, OUT_ARG2 movq rSELF, OUT_ARG3 - call SYMBOL(MterpSputObject) + call SYMBOL(MterpSPutObj) testb %al, %al jz MterpException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 diff --git a/runtime/interpreter/mterp/x86_64/op_sput_short.S b/runtime/interpreter/mterp/x86_64/op_sput_short.S index 9670092aaf..f73a3fc69e 100644 --- a/runtime/interpreter/mterp/x86_64/op_sput_short.S +++ b/runtime/interpreter/mterp/x86_64/op_sput_short.S @@ -1 +1 @@ -%include "x86_64/op_sput.S" {"helper":"MterpSetShortStatic"} +%include "x86_64/op_sput.S" {"helper":"MterpSPutI16"} diff --git a/runtime/interpreter/mterp/x86_64/op_sput_wide.S b/runtime/interpreter/mterp/x86_64/op_sput_wide.S index a21bcb5dd5..464d1697ac 100644 --- a/runtime/interpreter/mterp/x86_64/op_sput_wide.S +++ b/runtime/interpreter/mterp/x86_64/op_sput_wide.S @@ -3,13 +3,13 @@ * */ /* sput-wide vAA, field@BBBB */ - .extern MterpSet64Static + .extern MterpSPutU64 EXPORT_PC movzwq 2(rPC), OUT_ARG0 # field ref BBBB leaq VREG_ADDRESS(rINSTq), OUT_ARG1 # &fp[AA] movq OFF_FP_METHOD(rFP), OUT_ARG2 # referrer movq rSELF, OUT_ARG3 # self - call SYMBOL(MterpSet64Static) + call SYMBOL(MterpSPutU64) testb %al, %al jnz MterpException ADVANCE_PC_FETCH_AND_GOTO_NEXT 2 |