Deleted Added
full compact
acpi_wakecode.S (236772) acpi_wakecode.S (237027)
1/*-
2 * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
3 * Copyright (c) 2001-2012 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
4 * Copyright (c) 2003 Peter Wemm
5 * Copyright (c) 2008-2012 Jung-uk Kim <jkim@FreeBSD.org>
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
1/*-
2 * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
3 * Copyright (c) 2001-2012 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
4 * Copyright (c) 2003 Peter Wemm
5 * Copyright (c) 2008-2012 Jung-uk Kim <jkim@FreeBSD.org>
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $FreeBSD: head/sys/i386/acpica/acpi_wakecode.S 236772 2012-06-09 00:37:26Z iwasaki $
29 * $FreeBSD: head/sys/i386/acpica/acpi_wakecode.S 237027 2012-06-13 21:03:01Z jkim $
30 */
31
32#include <machine/asmacros.h>
33#include <machine/ppireg.h>
34#include <machine/specialreg.h>
35#include <machine/timerreg.h>
36
37#include "assym.s"

--- 99 unchanged lines hidden (view full) ---

137 ALIGN_TEXT
138 .code32
139wakeup_32:
140
141 mov $bootdata32 - bootgdt, %eax
142 mov %ax, %ds
143
144 /* Get PCB and return address. */
30 */
31
32#include <machine/asmacros.h>
33#include <machine/ppireg.h>
34#include <machine/specialreg.h>
35#include <machine/timerreg.h>
36
37#include "assym.s"

--- 99 unchanged lines hidden (view full) ---

137 ALIGN_TEXT
138 .code32
139wakeup_32:
140
141 mov $bootdata32 - bootgdt, %eax
142 mov %ax, %ds
143
144 /* Get PCB and return address. */
145 movl wakeup_pcb - wakeup_start(%ebx), %esi
146 movl wakeup_ret - wakeup_start(%ebx), %edi
145 movl wakeup_pcb - wakeup_start(%ebx), %ecx
146 movl wakeup_ret - wakeup_start(%ebx), %edx
147
148 /* Restore CR4 and CR3. */
149 movl wakeup_cr4 - wakeup_start(%ebx), %eax
150 mov %eax, %cr4
151 movl wakeup_cr3 - wakeup_start(%ebx), %eax
152 mov %eax, %cr3
153
154 /*

--- 6 unchanged lines hidden (view full) ---

161 */
162 mov %cr0, %eax
163 orl $CR0_PG, %eax
164 mov %eax, %cr0
165
166 jmp 1f
1671:
168 /* Jump to return address. */
147
148 /* Restore CR4 and CR3. */
149 movl wakeup_cr4 - wakeup_start(%ebx), %eax
150 mov %eax, %cr4
151 movl wakeup_cr3 - wakeup_start(%ebx), %eax
152 mov %eax, %cr3
153
154 /*

--- 6 unchanged lines hidden (view full) ---

161 */
162 mov %cr0, %eax
163 orl $CR0_PG, %eax
164 mov %eax, %cr0
165
166 jmp 1f
1671:
168 /* Jump to return address. */
169 jmp *%edi
169 jmp *%edx
170
171 .data
172
173resume_beep:
174 .byte 0
175reset_video:
176 .byte 0
177

--- 31 unchanged lines hidden ---
170
171 .data
172
173resume_beep:
174 .byte 0
175reset_video:
176 .byte 0
177

--- 31 unchanged lines hidden ---