Rejigger trapframe.

bb7770e6 · Silas Boyd-Wickizer · 809ef596 · bb7770e6 · bb7770e6
--- a/trapasm.S
+++ b/trapasm.S
@@ -36,6 +36,7 @@ trapcommon:
        pushq   %r15
        movw    %ds, %ax
        pushw   %ax
+        subq    $0xe, %rsp
        
        # Set up data and per-cpu segments.
        movw    $KDSEG, %ax
@@ -53,6 +54,7 @@ trapret:
        movw %ax, %ds
        movw %ax, %es
        // XXX(sbw) we should do something with fs, gs, gs.base
+        addq    $0xe, %rsp  // padding
        
        popq    %r15
        popq    %r14
@@ -69,7 +71,7 @@ trapret:
        popq    %rdx
        popq    %rsi
        popq    %rdi
-        addq    $0x16, %rsp  // trapno, err
+        addq    $0x10, %rsp  // trapno, err
        iretq
        
 .data

--- a/x86.h
+++ b/x86.h
@@ -139,6 +139,7 @@ rcr2(void)
 // hardware and by trapasm.S, and passed to trap().
 struct trapframe {
  u16 ds;
+  u16 padding3[7];

  // amd64 ABI callee saved registers
  u64 r15;