summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutechre2021-03-18 03:14:55 +0100
committerGitHub2021-03-18 03:14:55 +0100
commit11632ad5e3ac626d9687ae6f25f545cf852f1b55 (patch)
tree7f3a4dcb620ae825438dadc8dea01890e4b8bf56
parent3dfdaaa8d906c818600b7c52bb9fce6d898c3d49 (diff)
parent9de4220376bbada53dd1be1d3e6f40a6914c991f (diff)
downloadpicogpsp-11632ad5e3ac626d9687ae6f25f545cf852f1b55.tar.gz
picogpsp-11632ad5e3ac626d9687ae6f25f545cf852f1b55.tar.bz2
picogpsp-11632ad5e3ac626d9687ae6f25f545cf852f1b55.zip
Merge pull request #113 from davidgfnet/asmfixes2
asm fixes for clang
-rw-r--r--arm/arm_stub.S20
-rw-r--r--x86/x86_stub.S6
2 files changed, 18 insertions, 8 deletions
diff --git a/arm/arm_stub.S b/arm/arm_stub.S
index 27c7c64..e8f7316 100644
--- a/arm/arm_stub.S
+++ b/arm/arm_stub.S
@@ -8,6 +8,8 @@
.globl reg
.globl palette_ram
.globl palette_ram_converted
+.globl reg_mode
+.globl spsr
#define REG_R0 (0 * 4)
#define REG_R1 (1 * 4)
@@ -765,12 +767,18 @@ execute_load_builder(u32, 32, ldrne, #0xF0000000)
.data
-.comm memory_map_read 0x8000
-.comm memory_map_write 0x8000
-.comm palette_ram 0x400
-.comm palette_ram_converted 0x400
-.comm spsr 24
-.comm reg_mode 196
+memory_map_read:
+ .space 0x8000
+memory_map_write:
+ .space 0x8000
+palette_ram:
+ .space 0x400
+palette_ram_converted:
+ .space 0x400
+spsr:
+ .space 24
+reg_mode:
+ .space 196
.globl reg
.globl _reg
diff --git a/x86/x86_stub.S b/x86/x86_stub.S
index 8d76457..6765114 100644
--- a/x86/x86_stub.S
+++ b/x86/x86_stub.S
@@ -575,7 +575,9 @@ _spsr:
_reg_mode:
.space 196
-.comm _memory_map_read 0x8000
-.comm _memory_map_write 0x8000
+_memory_map_read:
+ .space 0x8000
+_memory_map_write:
+ .space 0x8000