Rejigger trapframe slightly.

f90b85bc · Silas Boyd-Wickizer · 013a2bac · f90b85bc · f90b85bc
--- a/trapasm.S
+++ b/trapasm.S
@@ -56,11 +56,11 @@ trapcommon:
 .globl trapret
 .align 8
 trapret:
+        addq $0xe, %rsp  // padding
        popw %ax
        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

--- a/x86.h
+++ b/x86.h
@@ -149,8 +149,8 @@ rcr2(void)
 // Layout of the trap frame built on the stack by the
 // hardware and by trapasm.S, and passed to trap().
 struct trapframe {
-  u16 ds;
  u16 padding3[7];
+  u16 ds;
  // amd64 ABI callee saved registers
  u64 r15;