riscv64: small cleanup
Test: it builds
lunch aosp_riscv64-userdebug
art/tools/buildbot-build.sh --target
Change-Id: I824474758a7208661c9333fa630b1065442120e8
diff --git a/runtime/interpreter/mterp/riscv64/main.S b/runtime/interpreter/mterp/riscv64/main.S
index fb65e29..fa317de 100644
--- a/runtime/interpreter/mterp/riscv64/main.S
+++ b/runtime/interpreter/mterp/riscv64/main.S
@@ -31,8 +31,8 @@
*
* 32 general purposes registers
* - fixed purpose: zero, ra, sp, gp, tp, s1
- * gp/scs: shadow call stack - do not use!
- * s1/tr: ART thread register - do not use!
+ * gp/scs: shadow call stack - do not clobber!
+ * s1/tr: ART thread register - do not clobber!
* - temporaries: t0-t6
* - arguments: a0-a7
* - return: a0, a1
diff --git a/runtime/interpreter/mterp/riscv64/object.S b/runtime/interpreter/mterp/riscv64/object.S
index 449df1e..5e9d54e 100644
--- a/runtime/interpreter/mterp/riscv64/object.S
+++ b/runtime/interpreter/mterp/riscv64/object.S
@@ -11,99 +11,100 @@
unimp
%def op_iget_boolean():
-% op_iget(load="ldrb", wide="0", is_object="0")
+ unimp
%def op_iget_byte():
-% op_iget(load="ldrsb", wide="0", is_object="0")
+ unimp
%def op_iget_char():
-% op_iget(load="ldrh", wide="0", is_object="0")
+ unimp
%def op_iget_short():
-% op_iget(load="ldrsh", wide="0", is_object="0")
+ unimp
-%def op_iget(load="ldr", wide="0", is_object="0"):
+%def op_iget(load="", wide="", is_object=""):
unimp
%def op_iget_slow_path(load, wide, is_object):
+ unimp
%def op_iget_wide():
-% op_iget(load="ldr", wide="1", is_object="0")
+ unimp
%def op_iget_object():
-% op_iget(load="ldr", wide="0", is_object="1")
+ unimp
%def op_iput_boolean():
-% op_iput(store="strb", wide="0", is_object="0")
+ unimp
%def op_iput_byte():
-% op_iput(store="strb", wide="0", is_object="0")
+ unimp
%def op_iput_char():
-% op_iput(store="strh", wide="0", is_object="0")
+ unimp
%def op_iput_short():
-% op_iput(store="strh", wide="0", is_object="0")
+ unimp
-%def op_iput(store="str", wide="0", is_object="0"):
+%def op_iput(store="", wide="", is_object=""):
unimp
%def op_iput_slow_path(store, wide, is_object):
unimp
%def op_iput_wide():
-% op_iput(store="str", wide="1", is_object="0")
-
-%def op_iput_object():
-% op_iput(store="str", wide="0", is_object="1")
-
-%def op_sget_boolean():
-% op_sget(load="ldrb", wide="0", is_object="0")
-
-%def op_sget_byte():
-% op_sget(load="ldrsb", wide="0", is_object="0")
-
-%def op_sget_char():
-% op_sget(load="ldrh", wide="0", is_object="0")
-
-%def op_sget_short():
-% op_sget(load="ldrsh", wide="0", is_object="0")
-
-%def op_sget(load="ldr", wide="0", is_object="0"):
unimp
-%def op_sget_slow_path(load="ldr", wide="0", is_object="0"):
+%def op_iput_object():
+ unimp
+
+%def op_sget_boolean():
+ unimp
+
+%def op_sget_byte():
+ unimp
+
+%def op_sget_char():
+ unimp
+
+%def op_sget_short():
+ unimp
+
+%def op_sget(load="", wide="", is_object=""):
+ unimp
+
+%def op_sget_slow_path(load, wide, is_object):
unimp
%def op_sget_wide():
-% op_sget(load="ldr", wide="1", is_object="0")
+ unimp
%def op_sget_object():
-% op_sget(load="ldr", wide="0", is_object="1")
+ unimp
%def op_sput_boolean():
-% op_sput(store="strb", wide="0", is_object="0")
+ unimp
%def op_sput_byte():
-% op_sput(store="strb", wide="0", is_object="0")
+ unimp
%def op_sput_char():
-% op_sput(store="strh", wide="0", is_object="0")
+ unimp
%def op_sput_short():
-% op_sput(store="strh", wide="0", is_object="0")
+ unimp
-%def op_sput(store="str", wide="0", is_object="0"):
+%def op_sput(store="", wide="", is_object=""):
unimp
%def op_sput_slow_path(store, wide, is_object):
unimp
%def op_sput_wide():
-% op_sput(store="str", wide="1", is_object="0")
+ unimp
%def op_sput_object():
-% op_sput(store="str", wide="0", is_object="1")
+ unimp
%def op_new_instance():
unimp
