summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-19 15:32:20 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-19 15:32:20 +0000
commite090b7e5de70b36e9d9a7793161d3c34d908279a (patch)
treed13271a3e680c71acac97f466b92284ca25bfc71
parent75e8e04a1907ffd75c7d5dc8e3d2ad927b49a9ff (diff)
downloadrtems-e090b7e5de70b36e9d9a7793161d3c34d908279a.tar.bz2
2000-10-19 Antti P Miettinen <anmietti@trshp.ntc.nokia.com>
* rtems/score/cpu.h: define CPU_Exception_frame for rdbg. * m68302.h: Make buffer pointer in m302_SCC_bd volatile.
-rw-r--r--c/src/exec/score/cpu/m68k/ChangeLog5
-rw-r--r--c/src/exec/score/cpu/m68k/m68302.h6
-rw-r--r--c/src/exec/score/cpu/m68k/rtems/score/cpu.h16
-rw-r--r--cpukit/score/cpu/m68k/ChangeLog5
-rw-r--r--cpukit/score/cpu/m68k/m68302.h6
-rw-r--r--cpukit/score/cpu/m68k/rtems/m68k/m68302.h6
-rw-r--r--cpukit/score/cpu/m68k/rtems/score/cpu.h16
7 files changed, 45 insertions, 15 deletions
diff --git a/c/src/exec/score/cpu/m68k/ChangeLog b/c/src/exec/score/cpu/m68k/ChangeLog
index ba91f67418..74cb783c1c 100644
--- a/c/src/exec/score/cpu/m68k/ChangeLog
+++ b/c/src/exec/score/cpu/m68k/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-19 Antti P Miettinen <anmietti@trshp.ntc.nokia.com>
+
+ * rtems/score/cpu.h: define CPU_Exception_frame for rdbg.
+ * m68302.h: Make buffer pointer in m302_SCC_bd volatile.
+
2000-10-12 John S Gwynne <jgwynne@mrcday.com>
* sim.h: These changes enable RTEMS to automatically generate
diff --git a/c/src/exec/score/cpu/m68k/m68302.h b/c/src/exec/score/cpu/m68k/m68302.h
index 084ceac034..c4bd0a5586 100644
--- a/c/src/exec/score/cpu/m68k/m68302.h
+++ b/c/src/exec/score/cpu/m68k/m68302.h
@@ -275,9 +275,9 @@ typedef struct {
* Section 4.5.5
*/
typedef struct m302_SCC_bd {
- rtems_unsigned16 status; /* status and control */
- rtems_unsigned16 length; /* data length */
- rtems_unsigned8 *buffer; /* data buffer pointer */
+ rtems_unsigned16 status; /* status and control */
+ rtems_unsigned16 length; /* data length */
+ volatile rtems_unsigned8 *buffer; /* data buffer pointer */
} m302_SCC_bd_t;
typedef struct {
diff --git a/c/src/exec/score/cpu/m68k/rtems/score/cpu.h b/c/src/exec/score/cpu/m68k/rtems/score/cpu.h
index a9a152cd2e..2353332620 100644
--- a/c/src/exec/score/cpu/m68k/rtems/score/cpu.h
+++ b/c/src/exec/score/cpu/m68k/rtems/score/cpu.h
@@ -165,14 +165,24 @@ typedef struct {
#endif
/*
- * The following structure defines the set of information saved
- * on the current stack by RTEMS upon receipt of each interrupt.
+ * The following structures define the set of information saved
+ * on the current stack by RTEMS upon receipt of each exc/interrupt.
+ * These are not used by m68k handlers.
+ * The exception frame is for rdbg.
*/
typedef struct {
- unsigned32 TBD; /* XXX Fix for this CPU */
+ unsigned32 vecnum; /* vector number */
} CPU_Interrupt_frame;
+typedef struct {
+ unsigned32 vecnum; /* vector number */
+ unsigned32 sr; /* status register */
+ unsigned32 pc; /* program counter */
+ unsigned32 d0, d1, d2, d3, d4, d5, d6, d7;
+ unsigned32 a0, a1, a2, a3, a4, a5, a6, a7;
+} CPU_Exception_frame;
+
/*
* The following table contains the information required to configure
* the m68k specific parameters.
diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog
index ba91f67418..74cb783c1c 100644
--- a/cpukit/score/cpu/m68k/ChangeLog
+++ b/cpukit/score/cpu/m68k/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-19 Antti P Miettinen <anmietti@trshp.ntc.nokia.com>
+
+ * rtems/score/cpu.h: define CPU_Exception_frame for rdbg.
+ * m68302.h: Make buffer pointer in m302_SCC_bd volatile.
+
2000-10-12 John S Gwynne <jgwynne@mrcday.com>
* sim.h: These changes enable RTEMS to automatically generate
diff --git a/cpukit/score/cpu/m68k/m68302.h b/cpukit/score/cpu/m68k/m68302.h
index 084ceac034..c4bd0a5586 100644
--- a/cpukit/score/cpu/m68k/m68302.h
+++ b/cpukit/score/cpu/m68k/m68302.h
@@ -275,9 +275,9 @@ typedef struct {
* Section 4.5.5
*/
typedef struct m302_SCC_bd {
- rtems_unsigned16 status; /* status and control */
- rtems_unsigned16 length; /* data length */
- rtems_unsigned8 *buffer; /* data buffer pointer */
+ rtems_unsigned16 status; /* status and control */
+ rtems_unsigned16 length; /* data length */
+ volatile rtems_unsigned8 *buffer; /* data buffer pointer */
} m302_SCC_bd_t;
typedef struct {
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68302.h b/cpukit/score/cpu/m68k/rtems/m68k/m68302.h
index 084ceac034..c4bd0a5586 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/m68302.h
+++ b/cpukit/score/cpu/m68k/rtems/m68k/m68302.h
@@ -275,9 +275,9 @@ typedef struct {
* Section 4.5.5
*/
typedef struct m302_SCC_bd {
- rtems_unsigned16 status; /* status and control */
- rtems_unsigned16 length; /* data length */
- rtems_unsigned8 *buffer; /* data buffer pointer */
+ rtems_unsigned16 status; /* status and control */
+ rtems_unsigned16 length; /* data length */
+ volatile rtems_unsigned8 *buffer; /* data buffer pointer */
} m302_SCC_bd_t;
typedef struct {
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/rtems/score/cpu.h
index a9a152cd2e..2353332620 100644
--- a/cpukit/score/cpu/m68k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m68k/rtems/score/cpu.h
@@ -165,14 +165,24 @@ typedef struct {
#endif
/*
- * The following structure defines the set of information saved
- * on the current stack by RTEMS upon receipt of each interrupt.
+ * The following structures define the set of information saved
+ * on the current stack by RTEMS upon receipt of each exc/interrupt.
+ * These are not used by m68k handlers.
+ * The exception frame is for rdbg.
*/
typedef struct {
- unsigned32 TBD; /* XXX Fix for this CPU */
+ unsigned32 vecnum; /* vector number */
} CPU_Interrupt_frame;
+typedef struct {
+ unsigned32 vecnum; /* vector number */
+ unsigned32 sr; /* status register */
+ unsigned32 pc; /* program counter */
+ unsigned32 d0, d1, d2, d3, d4, d5, d6, d7;
+ unsigned32 a0, a1, a2, a3, a4, a5, a6, a7;
+} CPU_Exception_frame;
+
/*
* The following table contains the information required to configure
* the m68k specific parameters.