Module Name: src
Committed By: matt
Date: Sat Sep 1 14:54:59 UTC 2012
Modified Files:
src/sys/arch/evbarm/beagle: beagle_start.S
Log Message:
shrink a little
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/beagle/beagle_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/beagle/beagle_start.S
diff -u src/sys/arch/evbarm/beagle/beagle_start.S:1.9 src/sys/arch/evbarm/beagle/beagle_start.S:1.10
--- src/sys/arch/evbarm/beagle/beagle_start.S:1.9 Wed Aug 29 18:04:23 2012
+++ src/sys/arch/evbarm/beagle/beagle_start.S Sat Sep 1 14:54:59 2012
@@ -92,7 +92,7 @@
#include <arm/omap/omap2_obioreg.h>
#include <evbarm/beagle/beagle.h>
-RCSID("$NetBSD: beagle_start.S,v 1.9 2012/08/29 18:04:23 matt Exp $")
+RCSID("$NetBSD: beagle_start.S,v 1.10 2012/09/01 14:54:59 matt Exp $")
#define Invalidate_I_cache(reg) \
mcr p15, 0, reg, c7, c5, 0 /* Invalidate Entire I cache */
@@ -144,15 +144,14 @@ _C_LABEL(beagle_start):
adr itable, mmu_init_table
ldr l1sfrm, Ll1_s_frame
b 3f
-2: str pa, [l1table, va]
- add va, va, #4
+2: str pa, [l1table, va, lsl #2]
+ add va, va, #1
add pa, pa, #(L1_S_SIZE)
adds n_sec, n_sec, #-1
bhi 2b
3: ldmia itable!, {va,pa,n_sec,attr}
/* Convert va to l1 offset: va = 4 * (va >> L1_S_SHIFT) */
- mov va, va, LSR #L1_S_SHIFT
- mov va, va, LSL #2
+ lsr va, va, #L1_S_SHIFT
/* Convert pa to l1 entry: pa = (pa & L1_S_FRAME) | attr */
and pa, pa, l1sfrm
orr pa, pa, attr
