9os

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 9515230bcc6174d2bbf1f8872996ee12cf520bf8
parent eefec00c787ec039b8256db13b45c4ea12580650
Author: Dimitris Papastamos <dimitris.papastamos@arm.com>
Date:   Sun, 14 Oct 2018 15:48:24 +0100

Put strings in .rodata section

Change-Id: I4f136fda53b5468798a9ae7a2f839393d042cf92
Signed-off-by: Dimitris Papastamos <dimitris.papastamos@arm.com>

Diffstat:
March/arm64/arch.s | 11++++++-----
March/arm64/crt-none.s | 1+
Msrc/libc/arch/arm64/_Exit-none.s | 3++-
Msrc/libc/arch/arm64/_getpid-none.s | 1+
Msrc/libc/arch/arm64/_kill-none.s | 3++-
Msrc/libc/arch/arm64/_write-none.s | 1+
6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/arch.s b/arch/arm64/arch.s @@ -167,11 +167,6 @@ swtch: ldp x1,x0,[sp],#16 eret -unexpected: - .asciz "unexpected exception" -outsync: - .asciz "out of sync" - _badtrap: adr x0,unexpected b panic @@ -201,3 +196,9 @@ vectbl: b _badtrap; nop /* IRQ/vIRQ */ b _badtrap; nop /* FIQ/vFIQ */ b _badtrap; nop /* SError/VSError */ + + .section .rodata +unexpected: + .asciz "unexpected exception" +outsync: + .asciz "out of sync" diff --git a/arch/arm64/crt-none.s b/arch/arm64/crt-none.s @@ -26,5 +26,6 @@ _start: adr x0,outsync b panic + .section .rodata outsync: .asciz "out of sync" diff --git a/src/libc/arch/arm64/_Exit-none.s b/src/libc/arch/arm64/_Exit-none.s @@ -1,9 +1,10 @@ .file "_Exit-none.s" .text - .globl _Exit,panic + .globl _Exit _Exit: ldr x0,=msg b panic + .section .rodata msg: .asciz "_Exit" diff --git a/src/libc/arch/arm64/_getpid-none.s b/src/libc/arch/arm64/_getpid-none.s @@ -6,4 +6,5 @@ _getpid: ldr x0,=msg b panic + .section .rodata msg: .asciz "_getpid" diff --git a/src/libc/arch/arm64/_kill-none.s b/src/libc/arch/arm64/_kill-none.s @@ -1,9 +1,10 @@ .file "_kill-none.s" .text - .globl _kill,panic + .globl _kill _kill: ldr x0,=msg b panic + .section .rodata msg: .asciz "_kill" diff --git a/src/libc/arch/arm64/_write-none.s b/src/libc/arch/arm64/_write-none.s @@ -76,5 +76,6 @@ busy: tbnz w2,FR_BUSY_BIT,busy ret + .section .rodata ansism: .byte 0x1b .ascii "[20h"