Module Name: src
Committed By: matt
Date: Thu Aug 20 07:45:40 UTC 2009
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: asm.h
Log Message:
Add XXX_WORD for INT and LONG.
Use PTR_LA in the PANIC macro.
To generate a diff of this commit:
cvs rdiff -u -r1.40.38.4 -r1.40.38.5 src/sys/arch/mips/include/asm.h
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/include/asm.h
diff -u src/sys/arch/mips/include/asm.h:1.40.38.4 src/sys/arch/mips/include/asm.h:1.40.38.5
--- src/sys/arch/mips/include/asm.h:1.40.38.4 Wed Aug 19 07:40:10 2009
+++ src/sys/arch/mips/include/asm.h Thu Aug 20 07:45:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: asm.h,v 1.40.38.4 2009/08/19 07:40:10 matt Exp $ */
+/* $NetBSD: asm.h,v 1.40.38.5 2009/08/20 07:45:40 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -251,13 +251,13 @@
* Macros to panic and printf from assembly language.
*/
#define PANIC(msg) \
- la a0, 9f; \
+ PTR_LA a0, 9f; \
jal _C_LABEL(panic); \
nop; \
MSG(msg)
#define PRINTF(msg) \
- la a0, 9f; \
+ PTR_LA a0, 9f; \
jal _C_LABEL(printf); \
nop; \
MSG(msg)
@@ -423,6 +423,7 @@
#define INT_SRAV srav
#define INT_LL ll
#define INT_SC sc
+#define INT_WORD .word
#define INT_SCALESHIFT 2
#else
#define INT_ADD dadd
@@ -444,6 +445,7 @@
#define INT_SRAV dsrav
#define INT_LL lld
#define INT_SC scd
+#define INT_WORD .dword
#define INT_SCALESHIFT 3
#endif
@@ -467,6 +469,7 @@
#define LONG_SRAV srav
#define LONG_LL ll
#define LONG_SC sc
+#define LONG_WORD .word
#define LONG_SCALESHIFT 2
#else
#define LONG_ADD dadd
@@ -488,6 +491,7 @@
#define LONG_SRAV dsrav
#define LONG_LL lld
#define LONG_SC scd
+#define LONG_WORD .dword
#define LONG_SCALESHIFT 3
#endif
