Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include machine/asm.h and use the ENTRY() macro for all function entry 

points.
This commit is contained in:
mark 1998-04-01 23:14:21 +00:00
parent 90a05fec98
commit ac4c80ec10
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/arch/arm32/mainbus/mainbus_io_asm.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus_io_asm.S,v 1.3 1997/10/14 21:25:04 mark Exp $ */
/* $NetBSD: mainbus_io_asm.S,v 1.4 1998/04/01 23:14:21 mark Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@ -32,34 +32,28 @@
* SUCH DAMAGE.
*/
#include <machine/asm.h>
/*
* bus_space I/O functions for mainbus
*/
sp .req r13
lr .req r14
pc .req r15
.text
/*
* read single
*/
.global _mainbus_r_1
_mainbus_r_1:
ENTRY(mainbus_r_1)
ldrb r0, [r1, r2, lsl #2]
mov pc, lr
.global _mainbus_r_2
_mainbus_r_2:
ENTRY(mainbus_r_2)
ldr r0, [r1, r2, lsl #2]
bic r0, r0, #0xff000000
bic r0, r0, #0x00ff0000
mov pc, lr
.global _mainbus_r_4
_mainbus_r_4:
ENTRY(mainbus_r_4)
ldr r0, [r1, r2, lsl #2]
mov pc, lr
@ -67,20 +61,17 @@ _mainbus_r_4:
* write single
*/
.global _mainbus_w_1
_mainbus_w_1:
ENTRY(mainbus_w_1)
strb r3, [r1, r2, lsl #2]
mov pc, lr
.global _mainbus_w_2
_mainbus_w_2:
ENTRY(mainbus_w_2)
mov r3, r3, lsl #16
orr r3, r3, r3, lsr #16
str r3, [r1, r2, lsl #2]
mov pc, lr
.global _mainbus_w_4
_mainbus_w_4:
ENTRY(mainbus_w_4)
str r3, [r1, r2, lsl #2]
mov pc, lr
@ -88,8 +79,7 @@ _mainbus_w_4:
* read multiple
*/
.global _mainbus_rm_2
_mainbus_rm_2:
ENTRY(mainbus_rm_2)
add r0, r1, r2, lsl #2
mov r1, r3
ldr r2, [sp, #0]
@ -99,8 +89,7 @@ _mainbus_rm_2:
* write multiple
*/
.global _mainbus_wm_1
_mainbus_wm_1:
ENTRY(mainbus_wm_1)
add r0, r1, r2, lsl #2
ldr r2, [sp, #0]
@ -116,8 +105,7 @@ mainbus_wm_1_loop:
mov pc, lr
.global _mainbus_wm_2
_mainbus_wm_2:
ENTRY(mainbus_wm_2)
add r0, r1, r2, lsl #2
mov r1, r3
ldr r2, [sp, #0]