riscv64: Cosmetic: use comma to separate macro arguments in assembly.
Test: treehugger
Change-Id: Id24633d9670c1bd81fa61e783014d0f7988ba142
diff --git a/runtime/arch/riscv64/asm_support_riscv64.S b/runtime/arch/riscv64/asm_support_riscv64.S
index cd1c0eb..1f7f554 100644
--- a/runtime/arch/riscv64/asm_support_riscv64.S
+++ b/runtime/arch/riscv64/asm_support_riscv64.S
@@ -54,7 +54,7 @@
// The spec is not clear whether the CFA is part of the saved state and tools differ in the
// behaviour, so explicitly set the CFA to avoid any ambiguity.
-.macro CFI_RESTORE_STATE_AND_DEF_CFA reg offset
+.macro CFI_RESTORE_STATE_AND_DEF_CFA reg, offset
.cfi_restore_state
.cfi_def_cfa \reg, \offset
.endm
@@ -117,37 +117,37 @@
// stack slot (0*8)(sp) is for ArtMethod*
// stack slot (1*8)(sp) is for padding
- SAVE_FPR fa0 (2*8)
- SAVE_FPR fa1 (3*8)
- SAVE_FPR fa2 (4*8)
- SAVE_FPR fa3 (5*8)
- SAVE_FPR fa4 (6*8)
- SAVE_FPR fa5 (7*8)
- SAVE_FPR fa6 (8*8)
- SAVE_FPR fa7 (9*8)
+ SAVE_FPR fa0, (2*8)
+ SAVE_FPR fa1, (3*8)
+ SAVE_FPR fa2, (4*8)
+ SAVE_FPR fa3, (5*8)
+ SAVE_FPR fa4, (6*8)
+ SAVE_FPR fa5, (7*8)
+ SAVE_FPR fa6, (8*8)
+ SAVE_FPR fa7, (9*8)
- SAVE_GPR fp (10*8) // x8, frame pointer
+ SAVE_GPR fp, (10*8) // x8, frame pointer
// a0 is the method pointer
- SAVE_GPR a1 (11*8) // x11
- SAVE_GPR a2 (12*8) // x12
- SAVE_GPR a3 (13*8) // x13
- SAVE_GPR a4 (14*8) // x14
- SAVE_GPR a5 (15*8) // x15
- SAVE_GPR a6 (16*8) // x16
- SAVE_GPR a7 (17*8) // x17
+ SAVE_GPR a1, (11*8) // x11
+ SAVE_GPR a2, (12*8) // x12
+ SAVE_GPR a3, (13*8) // x13
+ SAVE_GPR a4, (14*8) // x14
+ SAVE_GPR a5, (15*8) // x15
+ SAVE_GPR a6, (16*8) // x16
+ SAVE_GPR a7, (17*8) // x17
- SAVE_GPR s3 (18*8) // x19
- SAVE_GPR s4 (19*8) // x20
- SAVE_GPR s5 (20*8) // x21
- SAVE_GPR s6 (21*8) // x22
- SAVE_GPR s7 (22*8) // x23
- SAVE_GPR s8 (23*8) // x24
- SAVE_GPR s9 (24*8) // x25
- SAVE_GPR s10 (25*8) // x26
- SAVE_GPR s11 (26*8) // x27
+ SAVE_GPR s3, (18*8) // x19
+ SAVE_GPR s4, (19*8) // x20
+ SAVE_GPR s5, (20*8) // x21
+ SAVE_GPR s6, (21*8) // x22
+ SAVE_GPR s7, (22*8) // x23
+ SAVE_GPR s8, (23*8) // x24
+ SAVE_GPR s9, (24*8) // x25
+ SAVE_GPR s10, (25*8) // x26
+ SAVE_GPR s11, (26*8) // x27
- SAVE_GPR ra (27*8) // x1, return address
+ SAVE_GPR ra, (27*8) // x1, return address
.endm
@@ -155,37 +155,37 @@
// stack slot (0*8)(sp) is for ArtMethod*
// stack slot (1*8)(sp) is for padding
- RESTORE_FPR fa0 (2*8)
- RESTORE_FPR fa1 (3*8)
- RESTORE_FPR fa2 (4*8)
- RESTORE_FPR fa3 (5*8)
- RESTORE_FPR fa4 (6*8)
- RESTORE_FPR fa5 (7*8)
- RESTORE_FPR fa6 (8*8)
- RESTORE_FPR fa7 (9*8)
+ RESTORE_FPR fa0, (2*8)
+ RESTORE_FPR fa1, (3*8)
+ RESTORE_FPR fa2, (4*8)
+ RESTORE_FPR fa3, (5*8)
+ RESTORE_FPR fa4, (6*8)
+ RESTORE_FPR fa5, (7*8)
+ RESTORE_FPR fa6, (8*8)
+ RESTORE_FPR fa7, (9*8)
- RESTORE_GPR fp (10*8) // x8, frame pointer
+ RESTORE_GPR fp, (10*8) // x8, frame pointer
// a0 is the method pointer
- RESTORE_GPR a1 (11*8) // x11
- RESTORE_GPR a2 (12*8) // x12
- RESTORE_GPR a3 (13*8) // x13
- RESTORE_GPR a4 (14*8) // x14
- RESTORE_GPR a5 (15*8) // x15
- RESTORE_GPR a6 (16*8) // x16
- RESTORE_GPR a7 (17*8) // x17
+ RESTORE_GPR a1, (11*8) // x11
+ RESTORE_GPR a2, (12*8) // x12
+ RESTORE_GPR a3, (13*8) // x13
+ RESTORE_GPR a4, (14*8) // x14
+ RESTORE_GPR a5, (15*8) // x15
+ RESTORE_GPR a6, (16*8) // x16
+ RESTORE_GPR a7, (17*8) // x17
- RESTORE_GPR s3 (18*8) // x19
- RESTORE_GPR s4 (19*8) // x20
- RESTORE_GPR s5 (20*8) // x21
- RESTORE_GPR s6 (21*8) // x22
- RESTORE_GPR s7 (22*8) // x23
- RESTORE_GPR s8 (23*8) // x24
- RESTORE_GPR s9 (24*8) // x25
- RESTORE_GPR s10 (25*8) // x26
- RESTORE_GPR s11 (26*8) // x27
+ RESTORE_GPR s3, (18*8) // x19
+ RESTORE_GPR s4, (19*8) // x20
+ RESTORE_GPR s5, (20*8) // x21
+ RESTORE_GPR s6, (21*8) // x22
+ RESTORE_GPR s7, (22*8) // x23
+ RESTORE_GPR s8, (23*8) // x24
+ RESTORE_GPR s9, (24*8) // x25
+ RESTORE_GPR s10, (25*8) // x26
+ RESTORE_GPR s11, (26*8) // x27
- RESTORE_GPR ra (27*8) // x1, return address
+ RESTORE_GPR ra, (27*8) // x1, return address
.endm
@@ -198,7 +198,7 @@
.endm
-.macro SETUP_CALLEE_SAVE_FRAME_COMMON tmpreg offset
+.macro SETUP_CALLEE_SAVE_FRAME_COMMON tmpreg, offset
// art::Runtime* tmpreg = art::Runtime::instance_;
LOAD_RUNTIME_INSTANCE \tmpreg
@@ -212,7 +212,7 @@
.macro SETUP_SAVE_REFS_AND_ARGS_FRAME
INCREASE_FRAME FRAME_SIZE_SAVE_REFS_AND_ARGS
SETUP_SAVE_REFS_AND_ARGS_FRAME_INTERNAL
- SETUP_CALLEE_SAVE_FRAME_COMMON t0 RUNTIME_SAVE_REFS_AND_ARGS_METHOD_OFFSET
+ SETUP_CALLEE_SAVE_FRAME_COMMON t0, RUNTIME_SAVE_REFS_AND_ARGS_METHOD_OFFSET
.endm
@@ -236,39 +236,39 @@
// stack slot (0*8)(sp) is for ArtMethod*
// FP callee-saves.
- SAVE_FPR fs0 (8*1) // f8
- SAVE_FPR fs1 (8*2) // f9
- SAVE_FPR fs2 (8*3) // f18
- SAVE_FPR fs3 (8*4) // f19
- SAVE_FPR fs4 (8*5) // f20
- SAVE_FPR fs5 (8*6) // f21
- SAVE_FPR fs6 (8*7) // f22
- SAVE_FPR fs7 (8*8) // f23
- SAVE_FPR fs8 (8*9) // f24
- SAVE_FPR fs9 (8*10) // f25
- SAVE_FPR fs10 (8*11) // f26
- SAVE_FPR fs11 (8*12) // f27
+ SAVE_FPR fs0, (8*1) // f8
+ SAVE_FPR fs1, (8*2) // f9
+ SAVE_FPR fs2, (8*3) // f18
+ SAVE_FPR fs3, (8*4) // f19
+ SAVE_FPR fs4, (8*5) // f20
+ SAVE_FPR fs5, (8*6) // f21
+ SAVE_FPR fs6, (8*7) // f22
+ SAVE_FPR fs7, (8*8) // f23
+ SAVE_FPR fs8, (8*9) // f24
+ SAVE_FPR fs9, (8*10) // f25
+ SAVE_FPR fs10, (8*11) // f26
+ SAVE_FPR fs11, (8*12) // f27
// GP callee-saves
- SAVE_GPR s0 (8*13) // x8/fp, frame pointer
- SAVE_GPR s3 (8*14) // x19
- SAVE_GPR s4 (8*15) // x20
- SAVE_GPR s5 (8*16) // x21
- SAVE_GPR s6 (8*17) // x22
- SAVE_GPR s7 (8*18) // x23
- SAVE_GPR s8 (8*19) // x24
- SAVE_GPR s9 (8*20) // x25
- SAVE_GPR s10 (8*21) // x26
- SAVE_GPR s11 (8*22) // x27
+ SAVE_GPR s0, (8*13) // x8/fp, frame pointer
+ SAVE_GPR s3, (8*14) // x19
+ SAVE_GPR s4, (8*15) // x20
+ SAVE_GPR s5, (8*16) // x21
+ SAVE_GPR s6, (8*17) // x22
+ SAVE_GPR s7, (8*18) // x23
+ SAVE_GPR s8, (8*19) // x24
+ SAVE_GPR s9, (8*20) // x25
+ SAVE_GPR s10, (8*21) // x26
+ SAVE_GPR s11, (8*22) // x27
- SAVE_GPR ra (8*23) // x1, return address
+ SAVE_GPR ra, (8*23) // x1, return address
.endm
.macro SETUP_SAVE_ALL_CALLEE_SAVES_FRAME
INCREASE_FRAME FRAME_SIZE_SAVE_ALL_CALLEE_SAVES
SAVE_ALL_CALLEE_SAVES
- SETUP_CALLEE_SAVE_FRAME_COMMON t0 RUNTIME_SAVE_ALL_CALLEE_SAVES_METHOD_OFFSET
+ SETUP_CALLEE_SAVE_FRAME_COMMON t0, RUNTIME_SAVE_ALL_CALLEE_SAVES_METHOD_OFFSET
.endm
@@ -282,71 +282,71 @@
// stack slot (8*1)(sp) is for padding
// 32 slots for FPRs
- SAVE_FPR ft0 8*2 // f0
- SAVE_FPR ft1 8*3 // f1
- SAVE_FPR ft2 8*4 // f2
- SAVE_FPR ft3 8*5 // f3
- SAVE_FPR ft4 8*6 // f4
- SAVE_FPR ft5 8*7 // f5
- SAVE_FPR ft6 8*8 // f6
- SAVE_FPR ft7 8*9 // f7
- SAVE_FPR fs0 8*10 // f8
- SAVE_FPR fs1 8*11 // f9
+ SAVE_FPR ft0, 8*2 // f0
+ SAVE_FPR ft1, 8*3 // f1
+ SAVE_FPR ft2, 8*4 // f2
+ SAVE_FPR ft3, 8*5 // f3
+ SAVE_FPR ft4, 8*6 // f4
+ SAVE_FPR ft5, 8*7 // f5
+ SAVE_FPR ft6, 8*8 // f6
+ SAVE_FPR ft7, 8*9 // f7
+ SAVE_FPR fs0, 8*10 // f8
+ SAVE_FPR fs1, 8*11 // f9
#define SAVE_EVERYTHING_FRAME_OFFSET_FA0 (8*12)
- SAVE_FPR fa0 8*12 // f10, offset must equal SAVE_EVERYTHING_FRAME_OFFSET_FA0
- SAVE_FPR fa1 8*13 // f11
- SAVE_FPR fa2 8*14 // f12
- SAVE_FPR fa3 8*15 // f13
- SAVE_FPR fa4 8*16 // f14
- SAVE_FPR fa5 8*17 // f15
- SAVE_FPR fa6 8*18 // f16
- SAVE_FPR fa7 8*19 // f17
- SAVE_FPR fs2 8*20 // f18
- SAVE_FPR fs3 8*21 // f19
- SAVE_FPR fs4 8*22 // f20
- SAVE_FPR fs5 8*23 // f21
- SAVE_FPR fs6 8*24 // f22
- SAVE_FPR fs7 8*25 // f23
- SAVE_FPR fs8 8*26 // f24
- SAVE_FPR fs9 8*27 // f25
- SAVE_FPR fs10 8*28 // f26
- SAVE_FPR fs11 8*29 // f27
- SAVE_FPR ft8 8*30 // f28
- SAVE_FPR ft9 8*31 // f29
- SAVE_FPR ft10 8*32 // f30
- SAVE_FPR ft11 8*33 // f31
+ SAVE_FPR fa0, 8*12 // f10, offset must equal SAVE_EVERYTHING_FRAME_OFFSET_FA0
+ SAVE_FPR fa1, 8*13 // f11
+ SAVE_FPR fa2, 8*14 // f12
+ SAVE_FPR fa3, 8*15 // f13
+ SAVE_FPR fa4, 8*16 // f14
+ SAVE_FPR fa5, 8*17 // f15
+ SAVE_FPR fa6, 8*18 // f16
+ SAVE_FPR fa7, 8*19 // f17
+ SAVE_FPR fs2, 8*20 // f18
+ SAVE_FPR fs3, 8*21 // f19
+ SAVE_FPR fs4, 8*22 // f20
+ SAVE_FPR fs5, 8*23 // f21
+ SAVE_FPR fs6, 8*24 // f22
+ SAVE_FPR fs7, 8*25 // f23
+ SAVE_FPR fs8, 8*26 // f24
+ SAVE_FPR fs9, 8*27 // f25
+ SAVE_FPR fs10, 8*28 // f26
+ SAVE_FPR fs11, 8*29 // f27
+ SAVE_FPR ft8, 8*30 // f28
+ SAVE_FPR ft9, 8*31 // f29
+ SAVE_FPR ft10, 8*32 // f30
+ SAVE_FPR ft11, 8*33 // f31
// 26 slots for GPRs (excluded: zero/x0, sp/x2, tp/x3, gp/x4, s1/x9, s2/x18)
- SAVE_GPR t0 8*34 // x5
- SAVE_GPR t1 8*35 // x6
- SAVE_GPR t2 8*36 // x7
- SAVE_GPR s0 8*37 // x8
+ SAVE_GPR t0, 8*34 // x5
+ SAVE_GPR t1, 8*35 // x6
+ SAVE_GPR t2, 8*36 // x7
+ SAVE_GPR s0, 8*37 // x8
#define SAVE_EVERYTHING_FRAME_OFFSET_A0 (8*38)
- SAVE_GPR a0 8*38 // x10, offset must equal SAVE_EVERYTHING_FRAME_OFFSET_A0
- SAVE_GPR a1 8*39 // x11
- SAVE_GPR a2 8*40 // x12
- SAVE_GPR a3 8*41 // x13
- SAVE_GPR a4 8*42 // x14
- SAVE_GPR a5 8*43 // x15
- SAVE_GPR a6 8*44 // x16
- SAVE_GPR a7 8*45 // x17
- SAVE_GPR s3 8*46 // x19
- SAVE_GPR s4 8*47 // x20
- SAVE_GPR s5 8*48 // x21
- SAVE_GPR s6 8*49 // x22
- SAVE_GPR s7 8*50 // x23
- SAVE_GPR s8 8*51 // x24
- SAVE_GPR s9 8*52 // x25
- SAVE_GPR s10 8*53 // x26
- SAVE_GPR s11 8*54 // x27
- SAVE_GPR t3 8*55 // x28
- SAVE_GPR t4 8*56 // x29
- SAVE_GPR t5 8*57 // x30
- SAVE_GPR t6 8*58 // x31
+ SAVE_GPR a0, 8*38 // x10, offset must equal SAVE_EVERYTHING_FRAME_OFFSET_A0
+ SAVE_GPR a1, 8*39 // x11
+ SAVE_GPR a2, 8*40 // x12
+ SAVE_GPR a3, 8*41 // x13
+ SAVE_GPR a4, 8*42 // x14
+ SAVE_GPR a5, 8*43 // x15
+ SAVE_GPR a6, 8*44 // x16
+ SAVE_GPR a7, 8*45 // x17
+ SAVE_GPR s3, 8*46 // x19
+ SAVE_GPR s4, 8*47 // x20
+ SAVE_GPR s5, 8*48 // x21
+ SAVE_GPR s6, 8*49 // x22
+ SAVE_GPR s7, 8*50 // x23
+ SAVE_GPR s8, 8*51 // x24
+ SAVE_GPR s9, 8*52 // x25
+ SAVE_GPR s10, 8*53 // x26
+ SAVE_GPR s11, 8*54 // x27
+ SAVE_GPR t3, 8*55 // x28
+ SAVE_GPR t4, 8*56 // x29
+ SAVE_GPR t5, 8*57 // x30
+ SAVE_GPR t6, 8*58 // x31
- SAVE_GPR ra 8*59 // x1, return address
+ SAVE_GPR ra, 8*59 // x1, return address
- SETUP_CALLEE_SAVE_FRAME_COMMON t0 RUNTIME_SAVE_EVERYTHING_METHOD_OFFSET
+ SETUP_CALLEE_SAVE_FRAME_COMMON t0, RUNTIME_SAVE_EVERYTHING_METHOD_OFFSET
.endm
@@ -355,73 +355,73 @@
// stack slot (8*1)(sp) is for padding
// 32 slots for FPRs
- RESTORE_FPR ft0 (8*2) // f0
- RESTORE_FPR ft1 (8*3) // f1
- RESTORE_FPR ft2 (8*4) // f2
- RESTORE_FPR ft3 (8*5) // f3
- RESTORE_FPR ft4 (8*6) // f4
- RESTORE_FPR ft5 (8*7) // f5
- RESTORE_FPR ft6 (8*8) // f6
- RESTORE_FPR ft7 (8*9) // f7
- RESTORE_FPR fs0 (8*10) // f8
- RESTORE_FPR fs1 (8*11) // f9
+ RESTORE_FPR ft0, (8*2) // f0
+ RESTORE_FPR ft1, (8*3) // f1
+ RESTORE_FPR ft2, (8*4) // f2
+ RESTORE_FPR ft3, (8*5) // f3
+ RESTORE_FPR ft4, (8*6) // f4
+ RESTORE_FPR ft5, (8*7) // f5
+ RESTORE_FPR ft6, (8*8) // f6
+ RESTORE_FPR ft7, (8*9) // f7
+ RESTORE_FPR fs0, (8*10) // f8
+ RESTORE_FPR fs1, (8*11) // f9
#if SAVE_EVERYTHING_FRAME_OFFSET_FA0 != (8*12)
#error "unexpected SAVE_EVERYTHING_FRAME_OFFSET_FA0"
#endif
- RESTORE_FPR fa0 (8*12) // f10, offset must equal SAVE_EVERYTHING_FRAME_OFFSET_FA0
- RESTORE_FPR fa1 (8*13) // f11
- RESTORE_FPR fa2 (8*14) // f12
- RESTORE_FPR fa3 (8*15) // f13
- RESTORE_FPR fa4 (8*16) // f14
- RESTORE_FPR fa5 (8*17) // f15
- RESTORE_FPR fa6 (8*18) // f16
- RESTORE_FPR fa7 (8*19) // f17
- RESTORE_FPR fs2 (8*20) // f18
- RESTORE_FPR fs3 (8*21) // f19
- RESTORE_FPR fs4 (8*22) // f20
- RESTORE_FPR fs5 (8*23) // f21
- RESTORE_FPR fs6 (8*24) // f22
- RESTORE_FPR fs7 (8*25) // f23
- RESTORE_FPR fs8 (8*26) // f24
- RESTORE_FPR fs9 (8*27) // f25
- RESTORE_FPR fs10 (8*28) // f26
- RESTORE_FPR fs11 (8*29) // f27
- RESTORE_FPR ft8 (8*30) // f28
- RESTORE_FPR ft9 (8*31) // f29
- RESTORE_FPR ft10 (8*32) // f30
- RESTORE_FPR ft11 (8*33) // f31
+ RESTORE_FPR fa0, (8*12) // f10, offset must equal SAVE_EVERYTHING_FRAME_OFFSET_FA0
+ RESTORE_FPR fa1, (8*13) // f11
+ RESTORE_FPR fa2, (8*14) // f12
+ RESTORE_FPR fa3, (8*15) // f13
+ RESTORE_FPR fa4, (8*16) // f14
+ RESTORE_FPR fa5, (8*17) // f15
+ RESTORE_FPR fa6, (8*18) // f16
+ RESTORE_FPR fa7, (8*19) // f17
+ RESTORE_FPR fs2, (8*20) // f18
+ RESTORE_FPR fs3, (8*21) // f19
+ RESTORE_FPR fs4, (8*22) // f20
+ RESTORE_FPR fs5, (8*23) // f21
+ RESTORE_FPR fs6, (8*24) // f22
+ RESTORE_FPR fs7, (8*25) // f23
+ RESTORE_FPR fs8, (8*26) // f24
+ RESTORE_FPR fs9, (8*27) // f25
+ RESTORE_FPR fs10, (8*28) // f26
+ RESTORE_FPR fs11, (8*29) // f27
+ RESTORE_FPR ft8, (8*30) // f28
+ RESTORE_FPR ft9, (8*31) // f29
+ RESTORE_FPR ft10, (8*32) // f30
+ RESTORE_FPR ft11, (8*33) // f31
// 26 slots for GPRs (excluded: zero/x0, sp/x2, tp/x3, gp/x4, s1/x9, s2/x18)
- RESTORE_GPR t0 (8*34) // x5
- RESTORE_GPR t1 (8*35) // x6
- RESTORE_GPR t2 (8*36) // x7
- RESTORE_GPR s0 (8*37) // x8
+ RESTORE_GPR t0, (8*34) // x5
+ RESTORE_GPR t1, (8*35) // x6
+ RESTORE_GPR t2, (8*36) // x7
+ RESTORE_GPR s0, (8*37) // x8
#if SAVE_EVERYTHING_FRAME_OFFSET_A0 != (8*38)
#error "unexpected SAVE_EVERYTHING_FRAME_OFFSET_A0"
#endif
- RESTORE_GPR a0 (8*38) // x10, offset must equal SAVE_EVERYTHING_FRAME_OFFSET_A0
- RESTORE_GPR a1 (8*39) // x11
- RESTORE_GPR a2 (8*40) // x12
- RESTORE_GPR a3 (8*41) // x13
- RESTORE_GPR a4 (8*42) // x14
- RESTORE_GPR a5 (8*43) // x15
- RESTORE_GPR a6 (8*44) // x16
- RESTORE_GPR a7 (8*45) // x17
- RESTORE_GPR s3 (8*46) // x19
- RESTORE_GPR s4 (8*47) // x20
- RESTORE_GPR s5 (8*48) // x21
- RESTORE_GPR s6 (8*49) // x22
- RESTORE_GPR s7 (8*50) // x23
- RESTORE_GPR s8 (8*51) // x24
- RESTORE_GPR s9 (8*52) // x25
- RESTORE_GPR s10 (8*53) // x26
- RESTORE_GPR s11 (8*54) // x27
- RESTORE_GPR t3 (8*55) // x28
- RESTORE_GPR t4 (8*56) // x29
- RESTORE_GPR t5 (8*57) // x30
- RESTORE_GPR t6 (8*58) // x31
+ RESTORE_GPR a0, (8*38) // x10, offset must equal SAVE_EVERYTHING_FRAME_OFFSET_A0
+ RESTORE_GPR a1, (8*39) // x11
+ RESTORE_GPR a2, (8*40) // x12
+ RESTORE_GPR a3, (8*41) // x13
+ RESTORE_GPR a4, (8*42) // x14
+ RESTORE_GPR a5, (8*43) // x15
+ RESTORE_GPR a6, (8*44) // x16
+ RESTORE_GPR a7, (8*45) // x17
+ RESTORE_GPR s3, (8*46) // x19
+ RESTORE_GPR s4, (8*47) // x20
+ RESTORE_GPR s5, (8*48) // x21
+ RESTORE_GPR s6, (8*49) // x22
+ RESTORE_GPR s7, (8*50) // x23
+ RESTORE_GPR s8, (8*51) // x24
+ RESTORE_GPR s9, (8*52) // x25
+ RESTORE_GPR s10, (8*53) // x26
+ RESTORE_GPR s11, (8*54) // x27
+ RESTORE_GPR t3, (8*55) // x28
+ RESTORE_GPR t4, (8*56) // x29
+ RESTORE_GPR t5, (8*57) // x30
+ RESTORE_GPR t6, (8*58) // x31
- RESTORE_GPR ra (8*59) // x1, return address
+ RESTORE_GPR ra, (8*59) // x1, return address
DECREASE_FRAME FRAME_SIZE_SAVE_EVERYTHING
.endm
diff --git a/runtime/arch/riscv64/jni_entrypoints_riscv64.S b/runtime/arch/riscv64/jni_entrypoints_riscv64.S
index 1b9b195..63412b0 100644
--- a/runtime/arch/riscv64/jni_entrypoints_riscv64.S
+++ b/runtime/arch/riscv64/jni_entrypoints_riscv64.S
@@ -35,47 +35,47 @@
INCREASE_FRAME (ALL_ARGS_SIZE + \extra_space)
// Argument GPRs a0 - a7.
- SAVE_GPR a0 (8*0)
- SAVE_GPR a1 (8*1)
- SAVE_GPR a2 (8*2)
- SAVE_GPR a3 (8*3)
- SAVE_GPR a4 (8*4)
- SAVE_GPR a5 (8*5)
- SAVE_GPR a6 (8*6)
- SAVE_GPR a7 (8*7)
+ SAVE_GPR a0, (8*0)
+ SAVE_GPR a1, (8*1)
+ SAVE_GPR a2, (8*2)
+ SAVE_GPR a3, (8*3)
+ SAVE_GPR a4, (8*4)
+ SAVE_GPR a5, (8*5)
+ SAVE_GPR a6, (8*6)
+ SAVE_GPR a7, (8*7)
// Argument FPRs fa0 - fa7.
- SAVE_FPR fa0 (8*8)
- SAVE_FPR fa1 (8*9)
- SAVE_FPR fa2 (8*10)
- SAVE_FPR fa3 (8*11)
- SAVE_FPR fa4 (8*12)
- SAVE_FPR fa5 (8*13)
- SAVE_FPR fa6 (8*14)
- SAVE_FPR fa7 (8*15)
+ SAVE_FPR fa0, (8*8)
+ SAVE_FPR fa1, (8*9)
+ SAVE_FPR fa2, (8*10)
+ SAVE_FPR fa3, (8*11)
+ SAVE_FPR fa4, (8*12)
+ SAVE_FPR fa5, (8*13)
+ SAVE_FPR fa6, (8*14)
+ SAVE_FPR fa7, (8*15)
.endm
.macro RESTORE_ALL_ARGS_DECREASE_FRAME extra_space
// Argument GPRs a0 - a7.
- RESTORE_GPR a0 (8*0)
- RESTORE_GPR a1 (8*1)
- RESTORE_GPR a2 (8*2)
- RESTORE_GPR a3 (8*3)
- RESTORE_GPR a4 (8*4)
- RESTORE_GPR a5 (8*5)
- RESTORE_GPR a6 (8*6)
- RESTORE_GPR a7 (8*7)
+ RESTORE_GPR a0, (8*0)
+ RESTORE_GPR a1, (8*1)
+ RESTORE_GPR a2, (8*2)
+ RESTORE_GPR a3, (8*3)
+ RESTORE_GPR a4, (8*4)
+ RESTORE_GPR a5, (8*5)
+ RESTORE_GPR a6, (8*6)
+ RESTORE_GPR a7, (8*7)
// Argument FPRs fa0 - fa7.
- RESTORE_FPR fa0 (8*8)
- RESTORE_FPR fa1 (8*9)
- RESTORE_FPR fa2 (8*10)
- RESTORE_FPR fa3 (8*11)
- RESTORE_FPR fa4 (8*12)
- RESTORE_FPR fa5 (8*13)
- RESTORE_FPR fa6 (8*14)
- RESTORE_FPR fa7 (8*15)
+ RESTORE_FPR fa0, (8*8)
+ RESTORE_FPR fa1, (8*9)
+ RESTORE_FPR fa2, (8*10)
+ RESTORE_FPR fa3, (8*11)
+ RESTORE_FPR fa4, (8*12)
+ RESTORE_FPR fa5, (8*13)
+ RESTORE_FPR fa6, (8*14)
+ RESTORE_FPR fa7, (8*15)
DECREASE_FRAME (ALL_ARGS_SIZE + \extra_space)
.endm
@@ -86,8 +86,8 @@
.extern artFindNativeMethodRunnable
ENTRY art_jni_dlsym_lookup_stub
SAVE_ALL_ARGS_INCREASE_FRAME 2*8
- SAVE_GPR fp (ALL_ARGS_SIZE + 0)
- SAVE_GPR ra (ALL_ARGS_SIZE + 8)
+ SAVE_GPR fp, (ALL_ARGS_SIZE + 0)
+ SAVE_GPR ra, (ALL_ARGS_SIZE + 8)
add fp, sp, ALL_ARGS_SIZE
// Call artFindNativeMethod for normal native.
@@ -109,8 +109,8 @@
.Llookup_stub_continue:
mv t0, a0 // store result in a temp reg.
- RESTORE_GPR fp (ALL_ARGS_SIZE + 0)
- RESTORE_GPR ra (ALL_ARGS_SIZE + 8)
+ RESTORE_GPR fp, (ALL_ARGS_SIZE + 0)
+ RESTORE_GPR ra, (ALL_ARGS_SIZE + 8)
RESTORE_ALL_ARGS_DECREASE_FRAME 2*8
beqz t0, 1f // is method code null?
diff --git a/runtime/arch/riscv64/quick_entrypoints_riscv64.S b/runtime/arch/riscv64/quick_entrypoints_riscv64.S
index bca933a..ab8773f 100644
--- a/runtime/arch/riscv64/quick_entrypoints_riscv64.S
+++ b/runtime/arch/riscv64/quick_entrypoints_riscv64.S
@@ -24,15 +24,15 @@
// Argument 2: a2: The value of DEX PC (memory address of the methods bytecode).
ENTRY ExecuteSwitchImplAsm
INCREASE_FRAME 16
- SAVE_GPR s1 0
- SAVE_GPR ra 8
+ SAVE_GPR s1, 0
+ SAVE_GPR ra, 8
mv s1, a2 // s1 = DEX PC
CFI_DEFINE_DEX_PC_WITH_OFFSET(0 /* a0 */, 9 /* s1, a.k.a. x9 */, 0)
jalr a1 // Call the wrapped method.
- RESTORE_GPR s1 0
- RESTORE_GPR ra 8
+ RESTORE_GPR s1, 0
+ RESTORE_GPR ra, 8
DECREASE_FRAME 16
ret
END ExecuteSwitchImplAsm
@@ -42,12 +42,12 @@
// Save ra, fp, xSELF (current thread) a4, a5 (they will be needed in the invoke stub return)
// and callee-save regs s3 - s5 that are clobbered here and in art_quick_invoke_(static_)_stub.
INCREASE_FRAME 48
- SAVE_GPR fp (8*0)
- SAVE_GPR xSELF (8*1)
- SAVE_GPR a4 (8*2)
- SAVE_GPR a5 (8*3)
- SAVE_GPR s3 (8*4)
- SAVE_GPR ra (8*5)
+ SAVE_GPR fp, (8*0)
+ SAVE_GPR xSELF, (8*1)
+ SAVE_GPR a4, (8*2)
+ SAVE_GPR a5, (8*3)
+ SAVE_GPR s3, (8*4)
+ SAVE_GPR ra, (8*5)
mv fp, sp // save frame pointer
.cfi_def_cfa_register fp
@@ -88,12 +88,12 @@
// Restore ra, fp, xSELF (current thread) a4 (shorty), a5 (result pointer) and callee-save
// regs s3 - s5 from stack.
- RESTORE_GPR fp (8*0)
- RESTORE_GPR xSELF (8*1)
- RESTORE_GPR a4 (8*2)
- RESTORE_GPR a5 (8*3)
- RESTORE_GPR s3 (8*4)
- RESTORE_GPR ra (8*5)
+ RESTORE_GPR fp, (8*0)
+ RESTORE_GPR xSELF, (8*1)
+ RESTORE_GPR a4, (8*2)
+ RESTORE_GPR a5, (8*3)
+ RESTORE_GPR s3, (8*4)
+ RESTORE_GPR ra, (8*5)
DECREASE_FRAME 48
// Load result type (1-byte symbol) from a5.
@@ -375,7 +375,7 @@
RESTORE_SAVE_REFS_AND_ARGS_FRAME
fmv.d.x fa0, a0
ret
- CFI_RESTORE_STATE_AND_DEF_CFA sp FRAME_SIZE_SAVE_REFS_AND_ARGS
+ CFI_RESTORE_STATE_AND_DEF_CFA sp, FRAME_SIZE_SAVE_REFS_AND_ARGS
.Lcall_method_exit_hook:
fmv.d.x fa0, a0