diff options
| author | peter <peter@FreeBSD.org> | 2003-05-17 00:30:51 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2003-05-17 00:30:51 +0000 |
| commit | ee17e46a3e0b559a3997f4feb8ea1076df2ce08f (patch) | |
| tree | 4c622122ef1a274040a197261cd940c5d9c1b556 /sys/boot | |
| parent | d51b17e639d159b0d9a4f378b109ccb00d5d117a (diff) | |
| download | FreeBSD-src-ee17e46a3e0b559a3997f4feb8ea1076df2ce08f.zip FreeBSD-src-ee17e46a3e0b559a3997f4feb8ea1076df2ce08f.tar.gz | |
Fix a bug in the AMD64 trampoline. I misunderstood the implicit
32->64 bit zero extend. This changes a movl to an orq.
Approved by: re (amd64 bits)
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/libi386/amd64_tramp.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/i386/libi386/amd64_tramp.S b/sys/boot/i386/libi386/amd64_tramp.S index 012512d..ff12c66 100644 --- a/sys/boot/i386/libi386/amd64_tramp.S +++ b/sys/boot/i386/libi386/amd64_tramp.S @@ -108,6 +108,6 @@ longmode: /* We're still running V=P, jump to entry point */ movl %esi, %eax salq $32, %rax - movl %edi, %eax + orq %rdi, %rax pushq %rax ret |
