diff options
| author | rsc <rsc> | 2006-09-06 17:04:06 +0000 |
|---|---|---|
| committer | rsc <rsc> | 2006-09-06 17:04:06 +0000 |
| commit | a650c606fecc7e3938345e2bc52050a9ea725e7a (patch) | |
| tree | 3bd2cfcd215f7ad4abdb087cdfe91f608c7f0801 /trapasm.S | |
| parent | 45854caa93eecc3f80d34940b7cf6a400b640d69 (diff) | |
| download | xv6-labs-a650c606fecc7e3938345e2bc52050a9ea725e7a.tar.gz xv6-labs-a650c606fecc7e3938345e2bc52050a9ea725e7a.tar.bz2 xv6-labs-a650c606fecc7e3938345e2bc52050a9ea725e7a.zip | |
spacing fixes: no tabs, 2-space indents (for rtm)
Diffstat (limited to 'trapasm.S')
| -rw-r--r-- | trapasm.S | 54 |
1 files changed, 27 insertions, 27 deletions
@@ -1,38 +1,38 @@ - .text +.text .globl trap .globl trapret1 .globl alltraps alltraps: - /* vectors.S sends all traps here */ - pushl %ds # build - pushl %es # trap - pushal # frame - movl $16,%eax # SEG_KDATA << 3 - movw %ax,%ds # kernel - movw %ax,%es # segments - pushl %esp # pass pointer to this trapframe - call trap # and call trap() - addl $4, %esp - # return falls through to trapret... - - /* - * a forked process RETs here - * expects ESP to point to a Trapframe - */ + /* vectors.S sends all traps here */ + pushl %ds # build + pushl %es # trap + pushal # frame + movl $16,%eax # SEG_KDATA << 3 + movw %ax,%ds # kernel + movw %ax,%es # segments + pushl %esp # pass pointer to this trapframe + call trap # and call trap() + addl $4, %esp + # return falls through to trapret... + + /* + * a forked process RETs here + * expects ESP to point to a Trapframe + */ .globl trapret trapret: - popal - popl %es - popl %ds - addl $0x8, %esp /* trapno and errcode */ - iret + popal + popl %es + popl %ds + addl $0x8, %esp /* trapno and errcode */ + iret .globl forkret1 forkret1: - movl 4(%esp), %esp - jmp trapret - -.globl acpu + movl 4(%esp), %esp + jmp trapret + +.globl acpu acpu: - .long 0 + .long 0 |