[ros-diffs] [ros-arm-bringup] 34488: - Clean up KTRAP_FRAME and KEXCEPTION_FRAME definition. - Add assembly offsets for KEXCEPTION_FRAME to ksarm.h.

[ros-arm-bringup at svn.reactos.org]

Author: ros-arm-bringup
Date: Sun Jul 13 22:15:48 2008
New Revision: 34488

URL: http://svn.reactos.org/svn/reactos?rev=34488&view=rev
Log:
- Clean up KTRAP_FRAME and KEXCEPTION_FRAME definition.
- Add assembly offsets for KEXCEPTION_FRAME to ksarm.h.


Modified:
    trunk/reactos/include/ndk/arm/ketypes.h
    trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h

Modified: trunk/reactos/include/ndk/arm/ketypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?rev=34488&r1=34487&r2=34488&view=diff
==============================================================================
--- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Sun Jul 13 22:15:48 2008
@@ -59,10 +59,6 @@
 //
 typedef struct _KTRAP_FRAME
 {
-    //    ULONG Fpscr;
-    //    ULONG FpExc;
-    //    ULONG S[33];
-    //    ULONG FpExtra[8];
     ULONG DbgArgMark;
     ULONG R0;
     ULONG R1;
@@ -94,6 +90,10 @@
 //
 typedef struct _KEXCEPTION_FRAME
 {
+  //  ULONG R0;
+//    ULONG R1;
+//    ULONG R2;
+//    ULONG R3;    
     ULONG R4;
     ULONG R5;
     ULONG R6;
@@ -103,10 +103,8 @@
     ULONG R10;
     ULONG R11;
 //    ULONG R12;
-//    ULONG Sp;
+    ULONG Lr;
     ULONG Psr;
-    ULONG Lr;
-//    ULONG SwapReturn;
 } KEXCEPTION_FRAME, *PKEXCEPTION_FRAME;
 
 //

Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h?rev=34488&r1=34487&r2=34488&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] Sun Jul 13 22:15:48 2008
@@ -65,6 +65,21 @@
 .equ TrapFrameLength,      (22 * 0x04)
 
 /*
+ * Exception Frame offsets
+ */
+.equ ExR4,                 0x00
+.equ ExR5,                 0x04
+.equ ExR6,                 0x08
+.equ ExR7,                 0x0C
+.equ ExR8,                 0x10
+.equ ExR9,                 0x14
+.equ ExR10,                0x18
+.equ ExR11,                0x1C
+.equ ExLr,                 0x20
+.equ ExSpsr,               0x24
+.equ ExceptionFrameLength, (10 * 0x04)
+
+/*
  * PCR
  */
 .equ KiPcr,                0xFFFFF000