Module Name: src
Committed By: matt
Date: Wed Sep 9 04:49:25 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: cache_r5k_subr.S
Log Message:
Make LP64 safe.
To generate a diff of this commit:
cvs rdiff -u -r1.1.126.1 -r1.1.126.2 src/sys/arch/mips/mips/cache_r5k_subr.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/mips/mips/cache_r5k_subr.S
diff -u src/sys/arch/mips/mips/cache_r5k_subr.S:1.1.126.1 src/sys/arch/mips/mips/cache_r5k_subr.S:1.1.126.2
--- src/sys/arch/mips/mips/cache_r5k_subr.S:1.1.126.1 Mon Sep 7 23:47:27 2009
+++ src/sys/arch/mips/mips/cache_r5k_subr.S Wed Sep 9 04:49:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cache_r5k_subr.S,v 1.1.126.1 2009/09/07 23:47:27 matt Exp $ */
+/* $NetBSD: cache_r5k_subr.S,v 1.1.126.2 2009/09/09 04:49:25 matt Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
@@ -42,15 +42,15 @@
* Enable and clear out the R5k secondary (unified) cache.
*/
LEAF_NOPROFILE(r5k_enable_sdcache)
- lw t2, _C_LABEL(mips_sdcache_size)
- la t1, MIPS_KSEG0_START
+ INT_L t2, _C_LABEL(mips_sdcache_size)
+ PTR_LA t1, MIPS_KSEG0_START
beq t2, zero, 3f # if no sdcache, we can bail now
nop
- add t2, t1, t2
+ PTR_ADDU t2, t1, t2
- la v0, 1f
+ PTR_LA v0, 1f
or v0, MIPS_KSEG1_START
j v0 # run the rest from uncached space
@@ -66,7 +66,7 @@
2:
cache 0x17, 0(t1) # 0x17 == Page_Invalidate_SD
- addiu t1, t1, 4096
+ PTR_ADDU t1, t1, 4096
sltu v0, t1, t2
bne v0, zero, 2b
