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

Commit e6453c54 authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Fix unwind information for crash assembler."

parents a6b295b9 4761355a

debuggerd/crasher/arm/crashglue.S

+9 −0
Original line number Diff line number Diff line 
.globl crash1

.type crash1, %function

crash1:

	.cfi_startproc

	push {lr}

	.cfi_def_cfa_offset 4

	.cfi_rel_offset lr, 0

	ldr r0, =0xa5a50000

	ldr r1, =0xa5a50001

	ldr r2, =0xa5a50002
@@ -52,11 +56,16 @@ crash1: 
	mov lr, #0

	ldr lr, [lr]

	b .

	.cfi_endproc



.globl crashnostack

.type crashnostack, %function

crashnostack:

	.cfi_startproc

	mov r1, sp

	.cfi_def_cfa_register r1

	mov sp, #0

	mov r0, #0

	ldr r0, [r0]

	b .

	.cfi_endproc

debuggerd/crasher/arm64/crashglue.S

+10 −0
Original line number Diff line number Diff line 
.globl crash1

.type crash1, %function

crash1:

	.cfi_startproc

	stp x29, x30, [sp, -16]!

	.cfi_def_cfa_offset 16

	.cfi_rel_offset x29, 0

	.cfi_rel_offset x30, 8

	ldr x0, =0xa5a50000

	ldr x1, =0xa5a50001

	ldr x2, =0xa5a50002
@@ -68,12 +73,17 @@ crash1: 
	mov x30, xzr

	ldr x30, [x30]

	b .

	.cfi_endproc





.globl crashnostack

.type crashnostack, %function

crashnostack:

	.cfi_startproc

	mov x1, sp

	.cfi_def_cfa_register x1

	mov x0, xzr

	add sp, x0, xzr

	ldr x0, [x0]

	b .

	.cfi_endproc

debuggerd/crasher/x86/crashglue.S

+6 −2
Original line number Diff line number Diff line
@@ -11,5 +11,9 @@ crash1: 




crashnostack:

	movl $0, %ebp

	jmp *%ebp
 
	.cfi_startproc

	movl %esp, %eax

	.cfi_def_cfa_register %eax

	movl $0, %esp

	movl (%esp), %ebx

	.cfi_endproc

debuggerd/crasher/x86_64/crashglue.S

+6 −2
Original line number Diff line number Diff line
@@ -11,5 +11,9 @@ crash1: 




crashnostack:

	movl $0, %ebp

	jmp *%rbp
 
	.cfi_startproc

	movq %rsp, %rax

	.cfi_def_cfa_register %rax

	movq $0, %rsp

	movq (%rsp), %rbx

	.cfi_endproc