summaryrefslogtreecommitdiff
path: root/cactus/aarch64/cactus_entrypoint.S
diff options
context:
space:
mode:
Diffstat (limited to 'cactus/aarch64/cactus_entrypoint.S')
-rw-r--r--cactus/aarch64/cactus_entrypoint.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/cactus/aarch64/cactus_entrypoint.S b/cactus/aarch64/cactus_entrypoint.S
index a9f1920..aeab6de 100644
--- a/cactus/aarch64/cactus_entrypoint.S
+++ b/cactus/aarch64/cactus_entrypoint.S
@@ -40,7 +40,7 @@ func cactus_entrypoint
.macro set_sp_mem_attributes
cmp x2, #0 /* If size is 0, skip the call. */
beq 1f
- mov_imm x0, SP_MEM_ATTRIBUTES_SET_AARCH64
+ mov_imm x0, SP_MEMORY_ATTRIBUTES_SET_AARCH64
svc #0
cmp x0, #0
bne .return_error
@@ -51,21 +51,21 @@ func cactus_entrypoint
adr x2, __TEXT_END__
sub x2, x2, x1 /* __TEXT_SIZE__ */
lsr x2, x2, PAGE_SIZE_SHIFT /* __TEXT_SIZE__ in pages */
- mov x3, SP_MEM_ATTR_ACCESS_RO | SP_MEM_ATTR_EXEC
+ mov x3, SP_MEMORY_ATTRIBUTES_ACCESS_RO | SP_MEMORY_ATTRIBUTES_EXEC
set_sp_mem_attributes
adr x1, __RODATA_START__
adr x2, __RODATA_END__
sub x2, x2, x1 /* __RODATA_SIZE__ */
lsr x2, x2, PAGE_SIZE_SHIFT /* __RODATA_SIZE__ in pages */
- mov x3, SP_MEM_ATTR_ACCESS_RO | SP_MEM_ATTR_NON_EXEC
+ mov x3, SP_MEMORY_ATTRIBUTES_ACCESS_RO | SP_MEMORY_ATTRIBUTES_NON_EXEC
set_sp_mem_attributes
adr x1, __RWDATA_START__
adr x2, __RWDATA_END__
sub x2, x2, x1 /* __RWDATA_SIZE__ */
lsr x2, x2, PAGE_SIZE_SHIFT /* __RWDATA_SIZE__ in pages */
- mov x3, SP_MEM_ATTR_ACCESS_RW | SP_MEM_ATTR_NON_EXEC
+ mov x3, SP_MEMORY_ATTRIBUTES_ACCESS_RW | SP_MEMORY_ATTRIBUTES_NON_EXEC
set_sp_mem_attributes
/*
@@ -80,7 +80,7 @@ func cactus_entrypoint
sub x2, x1, x2 /* x2 = Used size, x22 = Total size */
sub x2, x22, x2 /* x2 = Unused size */
lsr x2, x2, PAGE_SIZE_SHIFT /* Unused size in pages */
- mov x3, SP_MEM_ATTR_ACCESS_NOACCESS | SP_MEM_ATTR_NON_EXEC
+ mov x3, SP_MEMORY_ATTRIBUTES_ACCESS_NOACCESS | SP_MEMORY_ATTRIBUTES_NON_EXEC
set_sp_mem_attributes
adr x0, __BSS_START__