summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml3
-rw-r--r--arm7/asm/MI_dma.s74
-rw-r--r--arm7/asm/MI_swap.s9
-rw-r--r--arm7/lib/include/MI_dma.h30
-rw-r--r--arm7/lib/include/MI_memory.h15
-rw-r--r--arm7/lib/include/MI_swap.h8
-rw-r--r--arm7/lib/src/MI_dma.c36
-rw-r--r--arm7/lib/src/MI_memory.c (renamed from arm7/asm/MI_memory.s)70
-rw-r--r--arm7/lib/src/MI_swap.c6
9 files changed, 131 insertions, 120 deletions
diff --git a/.travis.yml b/.travis.yml
index 5ce0b5e9..f316b43b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,12 @@ env:
addons:
apt:
packages:
- - gcc-multilib
+ - gcc-9
- linux-libc-dev
- binutils-arm-none-eabi
- wine32
- wine-stable
+ - g++-8
cache:
apt: true
install:
diff --git a/arm7/asm/MI_dma.s b/arm7/asm/MI_dma.s
deleted file mode 100644
index 8cbc8cb5..00000000
--- a/arm7/asm/MI_dma.s
+++ /dev/null
@@ -1,74 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .text
-
- arm_func_start MI_StopDma
-MI_StopDma: ; 0x037FB20C
- stmdb sp!, {r4, lr}
- mov r4, r0
- bl OS_DisableInterrupts
- mov r1, #6
- mul r1, r4, r1
- add r1, r1, #5
- mov r1, r1, lsl #1
- add r1, r1, #67108864 ; 0x4000000
- ldrh r2, [r1, #176] ; 0xb0
- bic r2, r2, #12800 ; 0x3200
- strh r2, [r1, #176] ; 0xb0
- ldrh r2, [r1, #176] ; 0xb0
- bic r2, r2, #32768 ; 0x8000
- strh r2, [r1, #176] ; 0xb0
- ldrh r2, [r1, #176] ; 0xb0
- ldrh r1, [r1, #176] ; 0xb0
- cmp r4, #0
- bne _037FB27C
- mov r1, #12
- mul r3, r4, r1
- ldr r1, _037FB288 ; =0x040000B0
- add r4, r3, r1
- mov r2, #0
- add r1, r3, #67108864 ; 0x4000000
- str r2, [r1, #176] ; 0xb0
- str r2, [r4, #4]
- ldr r1, _037FB28C ; =0x81400001
- str r1, [r4, #8]
-_037FB27C:
- bl OS_RestoreInterrupts
- ldmia sp!, {r4, lr}
- bx lr
-_037FB288: .word 0x040000B0
-_037FB28C: .word 0x81400001
-
- arm_func_start MI_WaitDma
-MI_WaitDma: ; 0x037FB290
- stmdb sp!, {r4, lr}
- mov r4, r0
- bl OS_DisableInterrupts
- mov r1, #3
- mul r1, r4, r1
- add r2, r1, #2
- ldr r1, _037FB2F8 ; =0x040000B0
- add r2, r1, r2, lsl #2
-_037FB2B0:
- ldr r1, [r2]
- ands r1, r1, #-2147483648 ; 0x80000000
- bne _037FB2B0
- cmp r4, #0
- bne _037FB2EC
- mov r1, #12
- mul r3, r4, r1
- ldr r1, _037FB2F8 ; =0x040000B0
- add r4, r3, r1
- mov r2, #0
- add r1, r3, #67108864 ; 0x4000000
- str r2, [r1, #176] ; 0xb0
- str r2, [r4, #4]
- ldr r1, _037FB2FC ; =0x81400001
- str r1, [r4, #8]
-_037FB2EC:
- bl OS_RestoreInterrupts
- ldmia sp!, {r4, lr}
- bx lr
-_037FB2F8: .word 0x040000B0
-_037FB2FC: .word 0x81400001
diff --git a/arm7/asm/MI_swap.s b/arm7/asm/MI_swap.s
deleted file mode 100644
index a5f08796..00000000
--- a/arm7/asm/MI_swap.s
+++ /dev/null
@@ -1,9 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .text
-
- arm_func_start MI_SwapWord
-MI_SwapWord: ; 0x037FB5A8
- swp r0, r0, [r1]
- bx lr
diff --git a/arm7/lib/include/MI_dma.h b/arm7/lib/include/MI_dma.h
new file mode 100644
index 00000000..4bae3663
--- /dev/null
+++ b/arm7/lib/include/MI_dma.h
@@ -0,0 +1,30 @@
+#ifndef GUARD_MI_DMA_H
+#define GUARD_MI_DMA_H
+
+#include "nitro/types.h"
+
+#define REG_ADDR_DMA0SAD 0x040000b0
+
+#define DMA_DEST_INC 0x0000
+#define DMA_DEST_DEC 0x0020
+#define DMA_DEST_FIXED 0x0040
+#define DMA_DEST_RELOAD 0x0060
+#define DMA_SRC_INC 0x0000
+#define DMA_SRC_DEC 0x0080
+#define DMA_SRC_FIXED 0x0100
+#define DMA_REPEAT 0x0200
+#define DMA_16BIT 0x0000
+#define DMA_32BIT 0x0400
+#define DMA_DREQ_ON 0x0800
+#define DMA_START_NOW 0x0000
+#define DMA_START_VBLANK 0x1000
+#define DMA_START_HBLANK 0x2000
+#define DMA_START_SPECIAL 0x3000
+#define DMA_START_MASK 0x3000
+#define DMA_INTR_ENABLE 0x4000
+#define DMA_ENABLE 0x8000
+
+void MI_StopDma(u32 channel);
+void MI_WaitDma(u32 channel);
+
+#endif
diff --git a/arm7/lib/include/MI_memory.h b/arm7/lib/include/MI_memory.h
new file mode 100644
index 00000000..cb0c53fc
--- /dev/null
+++ b/arm7/lib/include/MI_memory.h
@@ -0,0 +1,15 @@
+#ifndef GUARD_MI_MEMORY_H
+#define GUARD_MI_MEMORY_H
+
+#include "nitro/types.h"
+
+void MIi_CpuClear16(register u16 value, register u16 * dst, register u32 size);
+void MIi_CpuCopy16(register u16 * src, register u16 * dst, register u32 size);
+void MIi_CpuClear32(register u32 value, register u32 * dst, register u32 size);
+void MIi_CpuCopy32(register u32 * src, register u32 * dst, register u32 size);
+void MIi_CpuClearFast(register u32 value, register u32 * dst, register u32 size);
+void MIi_CpuCopyFast(register u32 * src, register u32 * dst, register u32 size);
+void MI_CpuFill8(register u8 value, register u8 * dst, register u32 size);
+void MI_CpuCopy8(register u8 * src, register u8 * dst, register u32 size);
+
+#endif
diff --git a/arm7/lib/include/MI_swap.h b/arm7/lib/include/MI_swap.h
new file mode 100644
index 00000000..8b18c5c1
--- /dev/null
+++ b/arm7/lib/include/MI_swap.h
@@ -0,0 +1,8 @@
+#ifndef GUARD_MI_SWAP_H
+#define GUARD_MI_SWAP_H
+
+#include "nitro/types.h"
+
+u32 MI_SwapWord(register u32 data, register u32 * dst);
+
+#endif
diff --git a/arm7/lib/src/MI_dma.c b/arm7/lib/src/MI_dma.c
new file mode 100644
index 00000000..fc2ff0c9
--- /dev/null
+++ b/arm7/lib/src/MI_dma.c
@@ -0,0 +1,36 @@
+#include "function_target.h"
+#include "MI_dma.h"
+#include "OS_system.h"
+
+ARM_FUNC void MI_WaitDma(u32 channel) {
+ OSIntrMode mode = OS_DisableInterrupts();
+ vu32 * addr = (vu32 *)(REG_ADDR_DMA0SAD + (channel * 3 + 2) * 4);
+ while(addr[0] & 0x80000000) ;
+ if (channel == 0) {
+ addr = (vu32 *)(REG_ADDR_DMA0SAD + channel * 12);
+ addr[0] = 0;
+ addr[1] = 0;
+ addr[2] = 0x81400001;
+ }
+ mode = OS_RestoreInterrupts(mode);
+}
+
+ARM_FUNC void MI_StopDma(u32 channel) {
+ OSIntrMode mode = OS_DisableInterrupts();
+ vu16 * addr = (vu16 *)(REG_ADDR_DMA0SAD + (channel * 6 + 5) * 2);
+ addr[0] &= ~(DMA_START_MASK | DMA_REPEAT);
+ addr[0] &= ~DMA_ENABLE;
+ {
+ s32 dummy = addr[0];
+ }
+ {
+ s32 dummy = addr[0];
+ }
+ if (channel == 0) {
+ vu32 * addr32 = (vu32 *)(REG_ADDR_DMA0SAD + channel * 12);
+ addr32[0] = 0;
+ addr32[1] = 0;
+ addr32[2] = 0x81400001;
+ }
+ mode = OS_RestoreInterrupts(mode);
+}
diff --git a/arm7/asm/MI_memory.s b/arm7/lib/src/MI_memory.c
index 7f3fdef2..51a0f33e 100644
--- a/arm7/asm/MI_memory.s
+++ b/arm7/lib/src/MI_memory.c
@@ -1,20 +1,17 @@
- .include "asm/macros.inc"
- .include "global.inc"
+#include "function_target.h"
+#include "MI_memory.h"
- .text
-
- arm_func_start MIi_CpuClear16
-MIi_CpuClear16: ; 0x037FB300
- mov r3, #0
-_037FB304:
+asm void MIi_CpuClear16(register u16 value, register u16 * dst, register u32 size) {
+ mov r3, #0
+loop:
cmp r3, r2
strlth r0, [r1, r3]
addlt r3, r3, #2
- blt _037FB304
+ blt loop
bx lr
+}
- arm_func_start MIi_CpuCopy16
-MIi_CpuCopy16: ; 0x037FB318
+asm void MIi_CpuCopy16(register u16 * src, register u16 * dst, register u32 size) {
mov ip, #0
_037FB31C:
cmp ip, r2
@@ -23,18 +20,18 @@ _037FB31C:
addlt ip, ip, #2
blt _037FB31C
bx lr
+}
- arm_func_start MIi_CpuClear32
-MIi_CpuClear32: ; 0x037FB334
+asm void MIi_CpuClear32(register u32 value, register u32 * dst, register u32 size) {
add ip, r1, r2
_037FB338:
cmp r1, ip
stmltia r1!, {r0}
blt _037FB338
bx lr
+}
- arm_func_start MIi_CpuCopy32
-MIi_CpuCopy32: ; 0x037FB348
+asm void MIi_CpuCopy32(register u32 * src, register u32 * dst, register u32 size) {
add ip, r1, r2
_037FB34C:
cmp r1, ip
@@ -42,9 +39,9 @@ _037FB34C:
stmltia r1!, {r2}
blt _037FB34C
bx lr
+}
- arm_func_start MIi_CpuClearFast
-MIi_CpuClearFast: ; 0x037FB360
+asm void MIi_CpuClearFast(register u32 value, register u32 * dst, register u32 size) {
stmdb sp!, {r4, r5, r6, r7, r8, r9}
add r9, r1, r2
mov ip, r2, lsr #5
@@ -66,34 +63,34 @@ _037FB398:
blt _037FB398
ldmia sp!, {r4, r5, r6, r7, r8, r9}
bx lr
+}
- arm_func_start MIi_CpuCopyFast
-MIi_CpuCopyFast: ; 0x037FB3AC
- stmdb sp!, {r4, r5, r6, r7, r8, r9, sl}
- add sl, r1, r2
+asm void MIi_CpuCopyFast(register u32 * src, register u32 * dst, register u32 size) {
+ stmdb sp!, {r4-r9, r10}
+ add r10, r1, r2
mov ip, r2, lsr #5
add ip, r1, ip, lsl #5
_037FB3BC:
cmp r1, ip
- ldmltia r0!, {r2, r3, r4, r5, r6, r7, r8, r9}
- stmltia r1!, {r2, r3, r4, r5, r6, r7, r8, r9}
+ ldmltia r0!, {r2-r9}
+ stmltia r1!, {r2-r9}
blt _037FB3BC
_037FB3CC:
- cmp r1, sl
+ cmp r1, r10
ldmltia r0!, {r2}
stmltia r1!, {r2}
blt _037FB3CC
- ldmia sp!, {r4, r5, r6, r7, r8, r9, sl}
+ ldmia sp!, {r4-r9, r10}
bx lr
+}
- arm_func_start MI_CpuFill8
-MI_CpuFill8: ; 0x037FB3E4
+asm void MI_CpuFill8(register u8 value, register u8 * dst, register u32 size) {
cmp r2, #0
bxeq lr
tst r0, #1
beq _037FB410
ldrh ip, [r0, #-1]
- and ip, ip, #255 ; 0xff
+ and ip, ip, #0xff
orr r3, ip, r1, lsl #8
strh r3, [r0, #-1]
add r0, r0, #1
@@ -125,20 +122,20 @@ _037FB458:
tst r2, #1
bxeq lr
ldrh r3, [r0]
- and r3, r3, #65280 ; 0xff00
- and r1, r1, #255 ; 0xff
+ and r3, r3, #0xff00
+ and r1, r1, #0xff
orr r1, r1, r3
strh r1, [r0]
bx lr
+}
- arm_func_start MI_CpuCopy8
-MI_CpuCopy8: ; 0x037FB478
+asm void MI_CpuCopy8(register u8 * src, register u8 * dst, register u32 size) {
cmp r2, #0
bxeq lr
tst r1, #1
beq _037FB4B8
ldrh ip, [r1, #-1]
- and ip, ip, #255 ; 0xff
+ and ip, ip, #0xff
tst r0, #1
ldrneh r3, [r0, #-1]
movne r3, r3, lsr #8
@@ -169,7 +166,7 @@ _037FB4F0:
tst r2, #1
bxeq lr
ldrh ip, [r1]
- and ip, ip, #65280 ; 0xff00
+ and ip, ip, #0xff00
orr ip, ip, r3
strh ip, [r1]
bx lr
@@ -214,8 +211,9 @@ _037FB584:
bxeq lr
ldrh r2, [r1]
ldrh r0, [r0]
- and r2, r2, #65280 ; 0xff00
- and r0, r0, #255 ; 0xff
+ and r2, r2, #0xff00
+ and r0, r0, #0xff
orr r0, r2, r0
strh r0, [r1]
bx lr
+}
diff --git a/arm7/lib/src/MI_swap.c b/arm7/lib/src/MI_swap.c
new file mode 100644
index 00000000..87a64060
--- /dev/null
+++ b/arm7/lib/src/MI_swap.c
@@ -0,0 +1,6 @@
+#include "MI_swap.h"
+
+asm u32 MI_SwapWord(register u32 data, register u32 * dst) {
+ swp r0, r0, [r1]
+ bx lr
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 13:19:22 +0000