Changeset 8e7c9fe in mainline for kernel/arch/amd64/src/asm.S

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• kernel/arch/amd64/src/asm.S (modified) (2 diffs)

kernel/arch/amd64/src/asm.S

@@ -29 +29 @@
 #include <arch/pm.h>
 #include <arch/mm/page.h>
+#include <arch/istate_struct.h>
 
 .text
@@ -142 +143 @@
         ret
 
-#define ISTATE_OFFSET_RAX               0
-#define ISTATE_OFFSET_RBX               8
-#define ISTATE_OFFSET_RCX               16
-#define ISTATE_OFFSET_RDX               24
-#define ISTATE_OFFSET_RSI               32
-#define ISTATE_OFFSET_RDI               40
-#define ISTATE_OFFSET_RBP               48
-#define ISTATE_OFFSET_R8                56
-#define ISTATE_OFFSET_R9                64
-#define ISTATE_OFFSET_R10               72
-#define ISTATE_OFFSET_R11               80
-#define ISTATE_OFFSET_R12               88      
-#define ISTATE_OFFSET_R13               96
-#define ISTATE_OFFSET_R14               104
-#define ISTATE_OFFSET_R15               112
-#define ISTATE_OFFSET_ALIGNMENT         120
-#define ISTATE_OFFSET_RBP_FRAME         128
-#define ISTATE_OFFSET_RIP_FRAME         136
-#define ISTATE_OFFSET_ERROR_WORD        144
-#define ISTATE_OFFSET_RIP               152
-#define ISTATE_OFFSET_CS                160
-#define ISTATE_OFFSET_RFLAGS            168
-#define ISTATE_OFFSET_RSP               176
-#define ISTATE_OFFSET_SS                184
-
 /*
  * Size of the istate structure without the hardware-saved part and without the
  * error word.
  */
-#define ISTATE_SOFT_SIZE        144
+#define ISTATE_SOFT_SIZE        ISTATE_SIZE - (6 * 8)
 
 /**