Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / include / asm-m32r / ptrace.h

diff --git a/include/asm-m32r/ptrace.h b/include/asm-m32r/ptrace.h
index 632b4ce..53c7924 100644 (file)
--- a/include/asm-m32r/ptrace.h
+++ b/include/asm-m32r/ptrace.h
@@ -12,6 +12,9 @@
  *   Copyright (C) 2001-2002, 2004  Hirokazu Takata <takata at linux-m32r.org>
  */
 
+#include <linux/config.h>
+#include <asm/m32r.h>          /* M32R_PSW_BSM, M32R_PSW_BPM */
+
 /* 0 - 13 are integer registers (general purpose registers).  */
 #define PT_R4          0
 #define PT_R5          1
@@ -33,10 +36,21 @@
 #define PT_R15         PT_SP
 
 /* processor status and miscellaneous context registers.  */
+#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)
 #define PT_ACC0H       15
 #define PT_ACC0L       16
-#define PT_ACC1H       17      /* ISA_DSP_LEVEL2 only */
-#define PT_ACC1L       18      /* ISA_DSP_LEVEL2 only */
+#define PT_ACC1H       17
+#define PT_ACC1L       18
+#define PT_ACCH                PT_ACC0H
+#define PT_ACCL                PT_ACC0L
+#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
+#define PT_ACCH                15
+#define PT_ACCL                16
+#define PT_DUMMY_ACC1H 17
+#define PT_DUMMY_ACC1L 18
+#else
+#error unknown isa conifiguration
+#endif
 #define PT_PSW         19
 #define PT_BPC         20
 #define PT_BBPSW       21
@@ -92,10 +106,19 @@ struct pt_regs {
        long syscall_nr;
 
        /* Saved main processor status and miscellaneous context registers. */
+#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)
        unsigned long acc0h;
        unsigned long acc0l;
-       unsigned long acc1h;    /* ISA_DSP_LEVEL2 only */
-       unsigned long acc1l;    /* ISA_DSP_LEVEL2 only */
+       unsigned long acc1h;
+       unsigned long acc1l;
+#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
+       unsigned long acch;
+       unsigned long accl;
+       unsigned long dummy_acc1h;
+       unsigned long dummy_acc1l;
+#else
+#error unknown isa configuration
+#endif
        unsigned long psw;
        unsigned long bpc;              /* saved PC for TRAP syscalls */
        unsigned long bbpsw;
@@ -118,8 +141,6 @@ struct pt_regs {
 
 #ifdef __KERNEL__
 
-#include <asm/m32r.h>          /* M32R_PSW_BSM, M32R_PSW_BPM */
-
 #define __ARCH_SYS_PTRACE      1
 
 #if defined(CONFIG_ISA_M32R2) || defined(CONFIG_CHIP_VDEC2)