Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 688a9ca0 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Fix riscv64's crash glue." am: fa4dd048 am: b3acc1fe 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2494343



Change-Id: I2f7a5f8603d6e83326286d8b9bd8b84e8aecdbc8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 19f4c86d b3acc1fe

debuggerd/crasher/riscv64/crashglue.S

+18 −6
Original line number Diff line number Diff line 


.globl crash1

	.globl crashnostack



crash1:

	.cfi_startproc

	addi sp, sp, -16

	.cfi_def_cfa_offset 16

	sd ra, 8(sp)

	.cfi_offset ra, -8



	li	x0,0xdead0000+0

	li	x1,0xdead0000+1

	li	x2,0xdead0000+2
@@ -33,13 +36,22 @@ crash1: 
	li	x27,0xdead0000+27

	li	x28,0xdead0000+28

	# don't trash the stack otherwise the signal handler won't run

	#li	$29,0xdead0000+29

	#li	x29,0xdead0000+29

	li	x30,0xdead0000+30

	li	x31,0xdead0000+31



	li sp, 0

	ld t2, 0(zero)

	j .

	.cfi_endproc





.globl crashnostack

crashnostack:

	.cfi_startproc

	mv t1, sp

	.cfi_def_cfa_register t1

	li sp, 0

	ld t2, 0(zero)

	j .

	.cfi_endproc