Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Macros for symbols used in both ASM and C

Browse Source 
-The macros take care of prepending the leading underscore when
 necessary.
This commit is contained in:
Arun Thomas
2010-08-17 16:44:07 +00:00
parent c8cfcab5db
commit 9a21d1a2fd
209 changed files with 1511 additions and 1863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

618
kernel/arch/i386/apic_asm.S
View File

@@ -2,30 +2,13 @@
#include "apic.h"
#include "sconst.h"
#include "apic_asm.h"
#include <machine/asm.h>
.globl _apic_hwint00 /* handlers for hardware interrupts */
.globl _apic_hwint01
.globl _apic_hwint02
.globl _apic_hwint03
.globl _apic_hwint04
.globl _apic_hwint05
.globl _apic_hwint06
.globl _apic_hwint07
.globl _apic_hwint08
.globl _apic_hwint09
.globl _apic_hwint10
.globl _apic_hwint11
.globl _apic_hwint12
.globl _apic_hwint13
.globl _apic_hwint14
.globl _apic_hwint15
.text
#define APIC_IRQ_HANDLER(irq) \
push $irq ;\
call _irq_handle /* intr_handle(irq_handlers[irq]) */ ;\
call _C_LABEL(irq_handle) /* intr_handle(irq_handlers[irq]) */ ;\
add $4, %esp ;\
mov _lapic_eoi_addr, %eax ;\
mov _C_LABEL(lapic_eoi_addr), %eax ;\
movl $0, (%eax) ;\
/*===========================================================================*/
@@ -38,98 +21,83 @@
\
SAVE_PROCESS_CTX(0) ;\
push %ebp ;\
call _context_stop ;\
call _C_LABEL(context_stop) ;\
add $4, %esp ;\
movl $0, %ebp /* for stack trace */ ;\
APIC_IRQ_HANDLER(irq) ;\
jmp _switch_to_user ;\
jmp _C_LABEL(switch_to_user) ;\
\
0: \
pusha ;\
call _context_stop_idle ;\
call _C_LABEL(context_stop_idle) ;\
APIC_IRQ_HANDLER(irq) ;\
CLEAR_IF(10*4(%esp)) ;\
popa ;\
iret ;
/* Handlers for hardware interrupts */
/* Each of these entry points is an expansion of the hwint_master macro */
.balign 16
_apic_hwint00:
ENTRY(apic_hwint00)
/* Interrupt routine for irq 0 (the clock). */
apic_hwint(0)
.balign 16
_apic_hwint01:
ENTRY(apic_hwint01)
/* Interrupt routine for irq 1 (keyboard) */
apic_hwint(1)
.balign 16
_apic_hwint02:
ENTRY(apic_hwint02)
/* Interrupt routine for irq 2 (cascade!) */
apic_hwint(2)
.balign 16
_apic_hwint03:
ENTRY(apic_hwint03)
/* Interrupt routine for irq 3 (second serial) */
apic_hwint(3)
.balign 16
_apic_hwint04:
ENTRY(apic_hwint04)
/* Interrupt routine for irq 4 (first serial) */
apic_hwint(4)
.balign 16
_apic_hwint05:
ENTRY(apic_hwint05)
/* Interrupt routine for irq 5 (XT winchester) */
apic_hwint(5)
.balign 16
_apic_hwint06:
ENTRY(apic_hwint06)
/* Interrupt routine for irq 6 (floppy) */
apic_hwint(6)
.balign 16
_apic_hwint07:
ENTRY(apic_hwint07)
/* Interrupt routine for irq 7 (printer) */
apic_hwint(7)
.balign 16
_apic_hwint08:
ENTRY(apic_hwint08)
/* Interrupt routine for irq 8 (realtime clock) */
apic_hwint(8)
.balign 16
_apic_hwint09:
ENTRY(apic_hwint09)
/* Interrupt routine for irq 9 (irq 2 redirected) */
apic_hwint(9)
.balign 16
_apic_hwint10:
ENTRY(apic_hwint10)
/* Interrupt routine for irq 10 */
apic_hwint(10)
.balign 16
_apic_hwint11:
ENTRY(apic_hwint11)
/* Interrupt routine for irq 11 */
apic_hwint(11)
.balign 16
_apic_hwint12:
ENTRY(apic_hwint12)
/* Interrupt routine for irq 12 */
apic_hwint(12)
.balign 16
_apic_hwint13:
ENTRY(apic_hwint13)
/* Interrupt routine for irq 13 (FPU exception) */
apic_hwint(13)
.balign 16
_apic_hwint14:
ENTRY(apic_hwint14)
/* Interrupt routine for irq 14 (AT winchester) */
apic_hwint(14)
.balign 16
_apic_hwint15:
ENTRY(apic_hwint15)
/* Interrupt routine for irq 15 */
apic_hwint(15)
@@ -137,7 +105,7 @@ _apic_hwint15:
#define LAPIC_INTR_HANDLER(func) \
movl $func, %eax ;\
call *%eax /* call the actual handler */ ;\
mov _lapic_eoi_addr, %eax /* the end of handler*/ ;\
mov _C_LABEL(lapic_eoi_addr), %eax /* the end of handler*/ ;\
movl $0, (%eax) ;
/*===========================================================================*/
@@ -149,28 +117,26 @@ _apic_hwint15:
\
SAVE_PROCESS_CTX(0) ;\
push %ebp ;\
call _context_stop ;\
call _C_LABEL(context_stop) ;\
add $4, %esp ;\
movl $0, %ebp /* for stack trace */ ;\
LAPIC_INTR_HANDLER(func) ;\
jmp _switch_to_user ;\
jmp _C_LABEL(switch_to_user) ;\
\
0: \
pusha ;\
call _context_stop_idle ;\
call _C_LABEL(context_stop_idle) ;\
LAPIC_INTR_HANDLER(func) ;\
CLEAR_IF(10*4(%esp)) ;\
popa ;\
iret ;
/* apic timer tick handlers */
.globl _lapic_bsp_timer_int_handler
_lapic_bsp_timer_int_handler:
lapic_intr(_bsp_timer_int_handler)
ENTRY(lapic_bsp_timer_int_handler)
lapic_intr(_C_LABEL(bsp_timer_int_handler))
.globl _lapic_ap_timer_int_handler
_lapic_ap_timer_int_handler:
lapic_intr(_ap_timer_int_handler)
ENTRY(lapic_ap_timer_int_handler)
lapic_intr(_C_LABEL(ap_timer_int_handler))
#ifdef CONFIG_APIC_DEBUG
@@ -183,275 +149,271 @@ lapic_intr_dummy_handler_msg:
#define lapic_intr_dummy_handler(vect) \
pushl $vect; \
push $lapic_intr_dummy_handler_msg; \
call _printf; \
call _C_LABEL(printf); \
1: jmp 1b; /* never return */
#define LAPIC_INTR_DUMMY_HANDLER(vect) \
.balign LAPIC_INTR_DUMMY_HANDLER_SIZE; \
lapic_intr_dummy_handler_##vect: lapic_intr_dummy_handler(vect)
.globl _lapic_intr_dummy_handles_start
_lapic_intr_dummy_handles_start:
LAPIC_INTR_DUMMY_HANDLER(0)
LAPIC_INTR_DUMMY_HANDLER(1)
LAPIC_INTR_DUMMY_HANDLER(2)
LAPIC_INTR_DUMMY_HANDLER(3)
LAPIC_INTR_DUMMY_HANDLER(4)
LAPIC_INTR_DUMMY_HANDLER(5)
LAPIC_INTR_DUMMY_HANDLER(6)
LAPIC_INTR_DUMMY_HANDLER(7)
LAPIC_INTR_DUMMY_HANDLER(8)
LAPIC_INTR_DUMMY_HANDLER(9)
LAPIC_INTR_DUMMY_HANDLER(10)
LAPIC_INTR_DUMMY_HANDLER(11)
LAPIC_INTR_DUMMY_HANDLER(12)
LAPIC_INTR_DUMMY_HANDLER(13)
LAPIC_INTR_DUMMY_HANDLER(14)
LAPIC_INTR_DUMMY_HANDLER(15)
LAPIC_INTR_DUMMY_HANDLER(16)
LAPIC_INTR_DUMMY_HANDLER(17)
LAPIC_INTR_DUMMY_HANDLER(18)
LAPIC_INTR_DUMMY_HANDLER(19)
LAPIC_INTR_DUMMY_HANDLER(20)
LAPIC_INTR_DUMMY_HANDLER(21)
LAPIC_INTR_DUMMY_HANDLER(22)
LAPIC_INTR_DUMMY_HANDLER(23)
LAPIC_INTR_DUMMY_HANDLER(24)
LAPIC_INTR_DUMMY_HANDLER(25)
LAPIC_INTR_DUMMY_HANDLER(26)
LAPIC_INTR_DUMMY_HANDLER(27)
LAPIC_INTR_DUMMY_HANDLER(28)
LAPIC_INTR_DUMMY_HANDLER(29)
LAPIC_INTR_DUMMY_HANDLER(30)
LAPIC_INTR_DUMMY_HANDLER(31)
LAPIC_INTR_DUMMY_HANDLER(32)
LAPIC_INTR_DUMMY_HANDLER(33)
LAPIC_INTR_DUMMY_HANDLER(34)
LAPIC_INTR_DUMMY_HANDLER(35)
LAPIC_INTR_DUMMY_HANDLER(36)
LAPIC_INTR_DUMMY_HANDLER(37)
LAPIC_INTR_DUMMY_HANDLER(38)
LAPIC_INTR_DUMMY_HANDLER(39)
LAPIC_INTR_DUMMY_HANDLER(40)
LAPIC_INTR_DUMMY_HANDLER(41)
LAPIC_INTR_DUMMY_HANDLER(42)
LAPIC_INTR_DUMMY_HANDLER(43)
LAPIC_INTR_DUMMY_HANDLER(44)
LAPIC_INTR_DUMMY_HANDLER(45)
LAPIC_INTR_DUMMY_HANDLER(46)
LAPIC_INTR_DUMMY_HANDLER(47)
LAPIC_INTR_DUMMY_HANDLER(48)
LAPIC_INTR_DUMMY_HANDLER(49)
LAPIC_INTR_DUMMY_HANDLER(50)
LAPIC_INTR_DUMMY_HANDLER(51)
LAPIC_INTR_DUMMY_HANDLER(52)
LAPIC_INTR_DUMMY_HANDLER(53)
LAPIC_INTR_DUMMY_HANDLER(54)
LAPIC_INTR_DUMMY_HANDLER(55)
LAPIC_INTR_DUMMY_HANDLER(56)
LAPIC_INTR_DUMMY_HANDLER(57)
LAPIC_INTR_DUMMY_HANDLER(58)
LAPIC_INTR_DUMMY_HANDLER(59)
LAPIC_INTR_DUMMY_HANDLER(60)
LAPIC_INTR_DUMMY_HANDLER(61)
LAPIC_INTR_DUMMY_HANDLER(62)
LAPIC_INTR_DUMMY_HANDLER(63)
LAPIC_INTR_DUMMY_HANDLER(64)
LAPIC_INTR_DUMMY_HANDLER(65)
LAPIC_INTR_DUMMY_HANDLER(66)
LAPIC_INTR_DUMMY_HANDLER(67)
LAPIC_INTR_DUMMY_HANDLER(68)
LAPIC_INTR_DUMMY_HANDLER(69)
LAPIC_INTR_DUMMY_HANDLER(70)
LAPIC_INTR_DUMMY_HANDLER(71)
LAPIC_INTR_DUMMY_HANDLER(72)
LAPIC_INTR_DUMMY_HANDLER(73)
LAPIC_INTR_DUMMY_HANDLER(74)
LAPIC_INTR_DUMMY_HANDLER(75)
LAPIC_INTR_DUMMY_HANDLER(76)
LAPIC_INTR_DUMMY_HANDLER(77)
LAPIC_INTR_DUMMY_HANDLER(78)
LAPIC_INTR_DUMMY_HANDLER(79)
LAPIC_INTR_DUMMY_HANDLER(80)
LAPIC_INTR_DUMMY_HANDLER(81)
LAPIC_INTR_DUMMY_HANDLER(82)
LAPIC_INTR_DUMMY_HANDLER(83)
LAPIC_INTR_DUMMY_HANDLER(84)
LAPIC_INTR_DUMMY_HANDLER(85)
LAPIC_INTR_DUMMY_HANDLER(86)
LAPIC_INTR_DUMMY_HANDLER(87)
LAPIC_INTR_DUMMY_HANDLER(88)
LAPIC_INTR_DUMMY_HANDLER(89)
LAPIC_INTR_DUMMY_HANDLER(90)
LAPIC_INTR_DUMMY_HANDLER(91)
LAPIC_INTR_DUMMY_HANDLER(92)
LAPIC_INTR_DUMMY_HANDLER(93)
LAPIC_INTR_DUMMY_HANDLER(94)
LAPIC_INTR_DUMMY_HANDLER(95)
LAPIC_INTR_DUMMY_HANDLER(96)
LAPIC_INTR_DUMMY_HANDLER(97)
LAPIC_INTR_DUMMY_HANDLER(98)
LAPIC_INTR_DUMMY_HANDLER(99)
LAPIC_INTR_DUMMY_HANDLER(100)
LAPIC_INTR_DUMMY_HANDLER(101)
LAPIC_INTR_DUMMY_HANDLER(102)
LAPIC_INTR_DUMMY_HANDLER(103)
LAPIC_INTR_DUMMY_HANDLER(104)
LAPIC_INTR_DUMMY_HANDLER(105)
LAPIC_INTR_DUMMY_HANDLER(106)
LAPIC_INTR_DUMMY_HANDLER(107)
LAPIC_INTR_DUMMY_HANDLER(108)
LAPIC_INTR_DUMMY_HANDLER(109)
LAPIC_INTR_DUMMY_HANDLER(110)
LAPIC_INTR_DUMMY_HANDLER(111)
LAPIC_INTR_DUMMY_HANDLER(112)
LAPIC_INTR_DUMMY_HANDLER(113)
LAPIC_INTR_DUMMY_HANDLER(114)
LAPIC_INTR_DUMMY_HANDLER(115)
LAPIC_INTR_DUMMY_HANDLER(116)
LAPIC_INTR_DUMMY_HANDLER(117)
LAPIC_INTR_DUMMY_HANDLER(118)
LAPIC_INTR_DUMMY_HANDLER(119)
LAPIC_INTR_DUMMY_HANDLER(120)
LAPIC_INTR_DUMMY_HANDLER(121)
LAPIC_INTR_DUMMY_HANDLER(122)
LAPIC_INTR_DUMMY_HANDLER(123)
LAPIC_INTR_DUMMY_HANDLER(124)
LAPIC_INTR_DUMMY_HANDLER(125)
LAPIC_INTR_DUMMY_HANDLER(126)
LAPIC_INTR_DUMMY_HANDLER(127)
LAPIC_INTR_DUMMY_HANDLER(128)
LAPIC_INTR_DUMMY_HANDLER(129)
LAPIC_INTR_DUMMY_HANDLER(130)
LAPIC_INTR_DUMMY_HANDLER(131)
LAPIC_INTR_DUMMY_HANDLER(132)
LAPIC_INTR_DUMMY_HANDLER(133)
LAPIC_INTR_DUMMY_HANDLER(134)
LAPIC_INTR_DUMMY_HANDLER(135)
LAPIC_INTR_DUMMY_HANDLER(136)
LAPIC_INTR_DUMMY_HANDLER(137)
LAPIC_INTR_DUMMY_HANDLER(138)
LAPIC_INTR_DUMMY_HANDLER(139)
LAPIC_INTR_DUMMY_HANDLER(140)
LAPIC_INTR_DUMMY_HANDLER(141)
LAPIC_INTR_DUMMY_HANDLER(142)
LAPIC_INTR_DUMMY_HANDLER(143)
LAPIC_INTR_DUMMY_HANDLER(144)
LAPIC_INTR_DUMMY_HANDLER(145)
LAPIC_INTR_DUMMY_HANDLER(146)
LAPIC_INTR_DUMMY_HANDLER(147)
LAPIC_INTR_DUMMY_HANDLER(148)
LAPIC_INTR_DUMMY_HANDLER(149)
LAPIC_INTR_DUMMY_HANDLER(150)
LAPIC_INTR_DUMMY_HANDLER(151)
LAPIC_INTR_DUMMY_HANDLER(152)
LAPIC_INTR_DUMMY_HANDLER(153)
LAPIC_INTR_DUMMY_HANDLER(154)
LAPIC_INTR_DUMMY_HANDLER(155)
LAPIC_INTR_DUMMY_HANDLER(156)
LAPIC_INTR_DUMMY_HANDLER(157)
LAPIC_INTR_DUMMY_HANDLER(158)
LAPIC_INTR_DUMMY_HANDLER(159)
LAPIC_INTR_DUMMY_HANDLER(160)
LAPIC_INTR_DUMMY_HANDLER(161)
LAPIC_INTR_DUMMY_HANDLER(162)
LAPIC_INTR_DUMMY_HANDLER(163)
LAPIC_INTR_DUMMY_HANDLER(164)
LAPIC_INTR_DUMMY_HANDLER(165)
LAPIC_INTR_DUMMY_HANDLER(166)
LAPIC_INTR_DUMMY_HANDLER(167)
LAPIC_INTR_DUMMY_HANDLER(168)
LAPIC_INTR_DUMMY_HANDLER(169)
LAPIC_INTR_DUMMY_HANDLER(170)
LAPIC_INTR_DUMMY_HANDLER(171)
LAPIC_INTR_DUMMY_HANDLER(172)
LAPIC_INTR_DUMMY_HANDLER(173)
LAPIC_INTR_DUMMY_HANDLER(174)
LAPIC_INTR_DUMMY_HANDLER(175)
LAPIC_INTR_DUMMY_HANDLER(176)
LAPIC_INTR_DUMMY_HANDLER(177)
LAPIC_INTR_DUMMY_HANDLER(178)
LAPIC_INTR_DUMMY_HANDLER(179)
LAPIC_INTR_DUMMY_HANDLER(180)
LAPIC_INTR_DUMMY_HANDLER(181)
LAPIC_INTR_DUMMY_HANDLER(182)
LAPIC_INTR_DUMMY_HANDLER(183)
LAPIC_INTR_DUMMY_HANDLER(184)
LAPIC_INTR_DUMMY_HANDLER(185)
LAPIC_INTR_DUMMY_HANDLER(186)
LAPIC_INTR_DUMMY_HANDLER(187)
LAPIC_INTR_DUMMY_HANDLER(188)
LAPIC_INTR_DUMMY_HANDLER(189)
LAPIC_INTR_DUMMY_HANDLER(190)
LAPIC_INTR_DUMMY_HANDLER(191)
LAPIC_INTR_DUMMY_HANDLER(192)
LAPIC_INTR_DUMMY_HANDLER(193)
LAPIC_INTR_DUMMY_HANDLER(194)
LAPIC_INTR_DUMMY_HANDLER(195)
LAPIC_INTR_DUMMY_HANDLER(196)
LAPIC_INTR_DUMMY_HANDLER(197)
LAPIC_INTR_DUMMY_HANDLER(198)
LAPIC_INTR_DUMMY_HANDLER(199)
LAPIC_INTR_DUMMY_HANDLER(200)
LAPIC_INTR_DUMMY_HANDLER(201)
LAPIC_INTR_DUMMY_HANDLER(202)
LAPIC_INTR_DUMMY_HANDLER(203)
LAPIC_INTR_DUMMY_HANDLER(204)
LAPIC_INTR_DUMMY_HANDLER(205)
LAPIC_INTR_DUMMY_HANDLER(206)
LAPIC_INTR_DUMMY_HANDLER(207)
LAPIC_INTR_DUMMY_HANDLER(208)
LAPIC_INTR_DUMMY_HANDLER(209)
LAPIC_INTR_DUMMY_HANDLER(210)
LAPIC_INTR_DUMMY_HANDLER(211)
LAPIC_INTR_DUMMY_HANDLER(212)
LAPIC_INTR_DUMMY_HANDLER(213)
LAPIC_INTR_DUMMY_HANDLER(214)
LAPIC_INTR_DUMMY_HANDLER(215)
LAPIC_INTR_DUMMY_HANDLER(216)
LAPIC_INTR_DUMMY_HANDLER(217)
LAPIC_INTR_DUMMY_HANDLER(218)
LAPIC_INTR_DUMMY_HANDLER(219)
LAPIC_INTR_DUMMY_HANDLER(220)
LAPIC_INTR_DUMMY_HANDLER(221)
LAPIC_INTR_DUMMY_HANDLER(222)
LAPIC_INTR_DUMMY_HANDLER(223)
LAPIC_INTR_DUMMY_HANDLER(224)
LAPIC_INTR_DUMMY_HANDLER(225)
LAPIC_INTR_DUMMY_HANDLER(226)
LAPIC_INTR_DUMMY_HANDLER(227)
LAPIC_INTR_DUMMY_HANDLER(228)
LAPIC_INTR_DUMMY_HANDLER(229)
LAPIC_INTR_DUMMY_HANDLER(230)
LAPIC_INTR_DUMMY_HANDLER(231)
LAPIC_INTR_DUMMY_HANDLER(232)
LAPIC_INTR_DUMMY_HANDLER(233)
LAPIC_INTR_DUMMY_HANDLER(234)
LAPIC_INTR_DUMMY_HANDLER(235)
LAPIC_INTR_DUMMY_HANDLER(236)
LAPIC_INTR_DUMMY_HANDLER(237)
LAPIC_INTR_DUMMY_HANDLER(238)
LAPIC_INTR_DUMMY_HANDLER(239)
LAPIC_INTR_DUMMY_HANDLER(240)
LAPIC_INTR_DUMMY_HANDLER(241)
LAPIC_INTR_DUMMY_HANDLER(242)
LAPIC_INTR_DUMMY_HANDLER(243)
LAPIC_INTR_DUMMY_HANDLER(244)
LAPIC_INTR_DUMMY_HANDLER(245)
LAPIC_INTR_DUMMY_HANDLER(246)
LAPIC_INTR_DUMMY_HANDLER(247)
LAPIC_INTR_DUMMY_HANDLER(248)
LAPIC_INTR_DUMMY_HANDLER(249)
LAPIC_INTR_DUMMY_HANDLER(250)
LAPIC_INTR_DUMMY_HANDLER(251)
LAPIC_INTR_DUMMY_HANDLER(252)
LAPIC_INTR_DUMMY_HANDLER(253)
LAPIC_INTR_DUMMY_HANDLER(254)
LAPIC_INTR_DUMMY_HANDLER(255)
.globl _lapic_intr_dummy_handles_end
_lapic_intr_dummy_handles_end:
LABEL(lapic_intr_dummy_handles_start)
LAPIC_INTR_DUMMY_HANDLER(0)
LAPIC_INTR_DUMMY_HANDLER(1)
LAPIC_INTR_DUMMY_HANDLER(2)
LAPIC_INTR_DUMMY_HANDLER(3)
LAPIC_INTR_DUMMY_HANDLER(4)
LAPIC_INTR_DUMMY_HANDLER(5)
LAPIC_INTR_DUMMY_HANDLER(6)
LAPIC_INTR_DUMMY_HANDLER(7)
LAPIC_INTR_DUMMY_HANDLER(8)
LAPIC_INTR_DUMMY_HANDLER(9)
LAPIC_INTR_DUMMY_HANDLER(10)
LAPIC_INTR_DUMMY_HANDLER(11)
LAPIC_INTR_DUMMY_HANDLER(12)
LAPIC_INTR_DUMMY_HANDLER(13)
LAPIC_INTR_DUMMY_HANDLER(14)
LAPIC_INTR_DUMMY_HANDLER(15)
LAPIC_INTR_DUMMY_HANDLER(16)
LAPIC_INTR_DUMMY_HANDLER(17)
LAPIC_INTR_DUMMY_HANDLER(18)
LAPIC_INTR_DUMMY_HANDLER(19)
LAPIC_INTR_DUMMY_HANDLER(20)
LAPIC_INTR_DUMMY_HANDLER(21)
LAPIC_INTR_DUMMY_HANDLER(22)
LAPIC_INTR_DUMMY_HANDLER(23)
LAPIC_INTR_DUMMY_HANDLER(24)
LAPIC_INTR_DUMMY_HANDLER(25)
LAPIC_INTR_DUMMY_HANDLER(26)
LAPIC_INTR_DUMMY_HANDLER(27)
LAPIC_INTR_DUMMY_HANDLER(28)
LAPIC_INTR_DUMMY_HANDLER(29)
LAPIC_INTR_DUMMY_HANDLER(30)
LAPIC_INTR_DUMMY_HANDLER(31)
LAPIC_INTR_DUMMY_HANDLER(32)
LAPIC_INTR_DUMMY_HANDLER(33)
LAPIC_INTR_DUMMY_HANDLER(34)
LAPIC_INTR_DUMMY_HANDLER(35)
LAPIC_INTR_DUMMY_HANDLER(36)
LAPIC_INTR_DUMMY_HANDLER(37)
LAPIC_INTR_DUMMY_HANDLER(38)
LAPIC_INTR_DUMMY_HANDLER(39)
LAPIC_INTR_DUMMY_HANDLER(40)
LAPIC_INTR_DUMMY_HANDLER(41)
LAPIC_INTR_DUMMY_HANDLER(42)
LAPIC_INTR_DUMMY_HANDLER(43)
LAPIC_INTR_DUMMY_HANDLER(44)
LAPIC_INTR_DUMMY_HANDLER(45)
LAPIC_INTR_DUMMY_HANDLER(46)
LAPIC_INTR_DUMMY_HANDLER(47)
LAPIC_INTR_DUMMY_HANDLER(48)
LAPIC_INTR_DUMMY_HANDLER(49)
LAPIC_INTR_DUMMY_HANDLER(50)
LAPIC_INTR_DUMMY_HANDLER(51)
LAPIC_INTR_DUMMY_HANDLER(52)
LAPIC_INTR_DUMMY_HANDLER(53)
LAPIC_INTR_DUMMY_HANDLER(54)
LAPIC_INTR_DUMMY_HANDLER(55)
LAPIC_INTR_DUMMY_HANDLER(56)
LAPIC_INTR_DUMMY_HANDLER(57)
LAPIC_INTR_DUMMY_HANDLER(58)
LAPIC_INTR_DUMMY_HANDLER(59)
LAPIC_INTR_DUMMY_HANDLER(60)
LAPIC_INTR_DUMMY_HANDLER(61)
LAPIC_INTR_DUMMY_HANDLER(62)
LAPIC_INTR_DUMMY_HANDLER(63)
LAPIC_INTR_DUMMY_HANDLER(64)
LAPIC_INTR_DUMMY_HANDLER(65)
LAPIC_INTR_DUMMY_HANDLER(66)
LAPIC_INTR_DUMMY_HANDLER(67)
LAPIC_INTR_DUMMY_HANDLER(68)
LAPIC_INTR_DUMMY_HANDLER(69)
LAPIC_INTR_DUMMY_HANDLER(70)
LAPIC_INTR_DUMMY_HANDLER(71)
LAPIC_INTR_DUMMY_HANDLER(72)
LAPIC_INTR_DUMMY_HANDLER(73)
LAPIC_INTR_DUMMY_HANDLER(74)
LAPIC_INTR_DUMMY_HANDLER(75)
LAPIC_INTR_DUMMY_HANDLER(76)
LAPIC_INTR_DUMMY_HANDLER(77)
LAPIC_INTR_DUMMY_HANDLER(78)
LAPIC_INTR_DUMMY_HANDLER(79)
LAPIC_INTR_DUMMY_HANDLER(80)
LAPIC_INTR_DUMMY_HANDLER(81)
LAPIC_INTR_DUMMY_HANDLER(82)
LAPIC_INTR_DUMMY_HANDLER(83)
LAPIC_INTR_DUMMY_HANDLER(84)
LAPIC_INTR_DUMMY_HANDLER(85)
LAPIC_INTR_DUMMY_HANDLER(86)
LAPIC_INTR_DUMMY_HANDLER(87)
LAPIC_INTR_DUMMY_HANDLER(88)
LAPIC_INTR_DUMMY_HANDLER(89)
LAPIC_INTR_DUMMY_HANDLER(90)
LAPIC_INTR_DUMMY_HANDLER(91)
LAPIC_INTR_DUMMY_HANDLER(92)
LAPIC_INTR_DUMMY_HANDLER(93)
LAPIC_INTR_DUMMY_HANDLER(94)
LAPIC_INTR_DUMMY_HANDLER(95)
LAPIC_INTR_DUMMY_HANDLER(96)
LAPIC_INTR_DUMMY_HANDLER(97)
LAPIC_INTR_DUMMY_HANDLER(98)
LAPIC_INTR_DUMMY_HANDLER(99)
LAPIC_INTR_DUMMY_HANDLER(100)
LAPIC_INTR_DUMMY_HANDLER(101)
LAPIC_INTR_DUMMY_HANDLER(102)
LAPIC_INTR_DUMMY_HANDLER(103)
LAPIC_INTR_DUMMY_HANDLER(104)
LAPIC_INTR_DUMMY_HANDLER(105)
LAPIC_INTR_DUMMY_HANDLER(106)
LAPIC_INTR_DUMMY_HANDLER(107)
LAPIC_INTR_DUMMY_HANDLER(108)
LAPIC_INTR_DUMMY_HANDLER(109)
LAPIC_INTR_DUMMY_HANDLER(110)
LAPIC_INTR_DUMMY_HANDLER(111)
LAPIC_INTR_DUMMY_HANDLER(112)
LAPIC_INTR_DUMMY_HANDLER(113)
LAPIC_INTR_DUMMY_HANDLER(114)
LAPIC_INTR_DUMMY_HANDLER(115)
LAPIC_INTR_DUMMY_HANDLER(116)
LAPIC_INTR_DUMMY_HANDLER(117)
LAPIC_INTR_DUMMY_HANDLER(118)
LAPIC_INTR_DUMMY_HANDLER(119)
LAPIC_INTR_DUMMY_HANDLER(120)
LAPIC_INTR_DUMMY_HANDLER(121)
LAPIC_INTR_DUMMY_HANDLER(122)
LAPIC_INTR_DUMMY_HANDLER(123)
LAPIC_INTR_DUMMY_HANDLER(124)
LAPIC_INTR_DUMMY_HANDLER(125)
LAPIC_INTR_DUMMY_HANDLER(126)
LAPIC_INTR_DUMMY_HANDLER(127)
LAPIC_INTR_DUMMY_HANDLER(128)
LAPIC_INTR_DUMMY_HANDLER(129)
LAPIC_INTR_DUMMY_HANDLER(130)
LAPIC_INTR_DUMMY_HANDLER(131)
LAPIC_INTR_DUMMY_HANDLER(132)
LAPIC_INTR_DUMMY_HANDLER(133)
LAPIC_INTR_DUMMY_HANDLER(134)
LAPIC_INTR_DUMMY_HANDLER(135)
LAPIC_INTR_DUMMY_HANDLER(136)
LAPIC_INTR_DUMMY_HANDLER(137)
LAPIC_INTR_DUMMY_HANDLER(138)
LAPIC_INTR_DUMMY_HANDLER(139)
LAPIC_INTR_DUMMY_HANDLER(140)
LAPIC_INTR_DUMMY_HANDLER(141)
LAPIC_INTR_DUMMY_HANDLER(142)
LAPIC_INTR_DUMMY_HANDLER(143)
LAPIC_INTR_DUMMY_HANDLER(144)
LAPIC_INTR_DUMMY_HANDLER(145)
LAPIC_INTR_DUMMY_HANDLER(146)
LAPIC_INTR_DUMMY_HANDLER(147)
LAPIC_INTR_DUMMY_HANDLER(148)
LAPIC_INTR_DUMMY_HANDLER(149)
LAPIC_INTR_DUMMY_HANDLER(150)
LAPIC_INTR_DUMMY_HANDLER(151)
LAPIC_INTR_DUMMY_HANDLER(152)
LAPIC_INTR_DUMMY_HANDLER(153)
LAPIC_INTR_DUMMY_HANDLER(154)
LAPIC_INTR_DUMMY_HANDLER(155)
LAPIC_INTR_DUMMY_HANDLER(156)
LAPIC_INTR_DUMMY_HANDLER(157)
LAPIC_INTR_DUMMY_HANDLER(158)
LAPIC_INTR_DUMMY_HANDLER(159)
LAPIC_INTR_DUMMY_HANDLER(160)
LAPIC_INTR_DUMMY_HANDLER(161)
LAPIC_INTR_DUMMY_HANDLER(162)
LAPIC_INTR_DUMMY_HANDLER(163)
LAPIC_INTR_DUMMY_HANDLER(164)
LAPIC_INTR_DUMMY_HANDLER(165)
LAPIC_INTR_DUMMY_HANDLER(166)
LAPIC_INTR_DUMMY_HANDLER(167)
LAPIC_INTR_DUMMY_HANDLER(168)
LAPIC_INTR_DUMMY_HANDLER(169)
LAPIC_INTR_DUMMY_HANDLER(170)
LAPIC_INTR_DUMMY_HANDLER(171)
LAPIC_INTR_DUMMY_HANDLER(172)
LAPIC_INTR_DUMMY_HANDLER(173)
LAPIC_INTR_DUMMY_HANDLER(174)
LAPIC_INTR_DUMMY_HANDLER(175)
LAPIC_INTR_DUMMY_HANDLER(176)
LAPIC_INTR_DUMMY_HANDLER(177)
LAPIC_INTR_DUMMY_HANDLER(178)
LAPIC_INTR_DUMMY_HANDLER(179)
LAPIC_INTR_DUMMY_HANDLER(180)
LAPIC_INTR_DUMMY_HANDLER(181)
LAPIC_INTR_DUMMY_HANDLER(182)
LAPIC_INTR_DUMMY_HANDLER(183)
LAPIC_INTR_DUMMY_HANDLER(184)
LAPIC_INTR_DUMMY_HANDLER(185)
LAPIC_INTR_DUMMY_HANDLER(186)
LAPIC_INTR_DUMMY_HANDLER(187)
LAPIC_INTR_DUMMY_HANDLER(188)
LAPIC_INTR_DUMMY_HANDLER(189)
LAPIC_INTR_DUMMY_HANDLER(190)
LAPIC_INTR_DUMMY_HANDLER(191)
LAPIC_INTR_DUMMY_HANDLER(192)
LAPIC_INTR_DUMMY_HANDLER(193)
LAPIC_INTR_DUMMY_HANDLER(194)
LAPIC_INTR_DUMMY_HANDLER(195)
LAPIC_INTR_DUMMY_HANDLER(196)
LAPIC_INTR_DUMMY_HANDLER(197)
LAPIC_INTR_DUMMY_HANDLER(198)
LAPIC_INTR_DUMMY_HANDLER(199)
LAPIC_INTR_DUMMY_HANDLER(200)
LAPIC_INTR_DUMMY_HANDLER(201)
LAPIC_INTR_DUMMY_HANDLER(202)
LAPIC_INTR_DUMMY_HANDLER(203)
LAPIC_INTR_DUMMY_HANDLER(204)
LAPIC_INTR_DUMMY_HANDLER(205)
LAPIC_INTR_DUMMY_HANDLER(206)
LAPIC_INTR_DUMMY_HANDLER(207)
LAPIC_INTR_DUMMY_HANDLER(208)
LAPIC_INTR_DUMMY_HANDLER(209)
LAPIC_INTR_DUMMY_HANDLER(210)
LAPIC_INTR_DUMMY_HANDLER(211)
LAPIC_INTR_DUMMY_HANDLER(212)
LAPIC_INTR_DUMMY_HANDLER(213)
LAPIC_INTR_DUMMY_HANDLER(214)
LAPIC_INTR_DUMMY_HANDLER(215)
LAPIC_INTR_DUMMY_HANDLER(216)
LAPIC_INTR_DUMMY_HANDLER(217)
LAPIC_INTR_DUMMY_HANDLER(218)
LAPIC_INTR_DUMMY_HANDLER(219)
LAPIC_INTR_DUMMY_HANDLER(220)
LAPIC_INTR_DUMMY_HANDLER(221)
LAPIC_INTR_DUMMY_HANDLER(222)
LAPIC_INTR_DUMMY_HANDLER(223)
LAPIC_INTR_DUMMY_HANDLER(224)
LAPIC_INTR_DUMMY_HANDLER(225)
LAPIC_INTR_DUMMY_HANDLER(226)
LAPIC_INTR_DUMMY_HANDLER(227)
LAPIC_INTR_DUMMY_HANDLER(228)
LAPIC_INTR_DUMMY_HANDLER(229)
LAPIC_INTR_DUMMY_HANDLER(230)
LAPIC_INTR_DUMMY_HANDLER(231)
LAPIC_INTR_DUMMY_HANDLER(232)
LAPIC_INTR_DUMMY_HANDLER(233)
LAPIC_INTR_DUMMY_HANDLER(234)
LAPIC_INTR_DUMMY_HANDLER(235)
LAPIC_INTR_DUMMY_HANDLER(236)
LAPIC_INTR_DUMMY_HANDLER(237)
LAPIC_INTR_DUMMY_HANDLER(238)
LAPIC_INTR_DUMMY_HANDLER(239)
LAPIC_INTR_DUMMY_HANDLER(240)
LAPIC_INTR_DUMMY_HANDLER(241)
LAPIC_INTR_DUMMY_HANDLER(242)
LAPIC_INTR_DUMMY_HANDLER(243)
LAPIC_INTR_DUMMY_HANDLER(244)
LAPIC_INTR_DUMMY_HANDLER(245)
LAPIC_INTR_DUMMY_HANDLER(246)
LAPIC_INTR_DUMMY_HANDLER(247)
LAPIC_INTR_DUMMY_HANDLER(248)
LAPIC_INTR_DUMMY_HANDLER(249)
LAPIC_INTR_DUMMY_HANDLER(250)
LAPIC_INTR_DUMMY_HANDLER(251)
LAPIC_INTR_DUMMY_HANDLER(252)
LAPIC_INTR_DUMMY_HANDLER(253)
LAPIC_INTR_DUMMY_HANDLER(254)
LAPIC_INTR_DUMMY_HANDLER(255)
LABEL(lapic_intr_dummy_handles_end)
#endif /* CONFIG_APIC_DEBUG */

9
kernel/arch/i386/debugreg.S
View File

@@ -1,15 +1,12 @@
.text
#include <machine/asm.h>
#define LD_ST_REG(reg) ;\
.globl _ld_##reg ;\
.globl _st_##reg ;\
;\
_ld_##reg: ;\
ENTRY(ld_##reg) ;\
mov 4(%esp), %eax ;\
mov %eax, %reg ;\
ret ;\
;\
_st_##reg: ;\
ENTRY(st_##reg) ;\
mov %reg, %eax ;\
ret

5
kernel/arch/i386/io_inb.S
View File

@@ -1,10 +1,9 @@
/* inb() - Input one byte Author: Kees J. Bot */
/* 18 Mar 1996 */
/* unsigned inb(U16_t port); */
#include <machine/asm.h>
.text
.globl _inb
_inb:
ENTRY(inb)
push %ebp
movl %esp, %ebp
movl 8(%ebp), %edx /* port */

5
kernel/arch/i386/io_inl.S
View File

@@ -1,10 +1,9 @@
/* inl() - Input one dword Author: Kees J. Bot */
/* 18 Mar 1996 */
/* unsigned inl(U16_t port); */
#include <machine/asm.h>
.text
.globl _inl
_inl:
ENTRY(inl)
push %ebp
movl %esp, %ebp
movl 8(%ebp), %edx /* port */

8
kernel/arch/i386/io_intr.S
View File

@@ -3,14 +3,12 @@
/* 18 Mar 1996 */
/* void intr_disable(void); */
/* void intr_enable(void); */
#include <machine/asm.h>
.text
.globl _intr_disable
_intr_disable:
ENTRY(intr_disable)
cli
ret
.globl _intr_enable
_intr_enable:
ENTRY(intr_enable)
sti
ret

5
kernel/arch/i386/io_inw.S
View File

@@ -1,10 +1,9 @@
/* inw() - Input one word Author: Kees J. Bot */
/* 18 Mar 1996 */
/* unsigned inw(U16_t port); */
#include <machine/asm.h>
.text
.globl _inw
_inw:
ENTRY(inw)
push %ebp
movl %esp, %ebp
movl 8(%ebp), %edx /* port */

5
kernel/arch/i386/io_outb.S
View File

@@ -1,10 +1,9 @@
/* outb() - Output one byte Author: Kees J. Bot */
/* 18 Mar 1996 */
/* void outb(U16_t port, U8_t value); */
#include <machine/asm.h>
.text
.globl _outb
_outb:
ENTRY(outb)
push %ebp
movl %esp, %ebp
movl 8(%ebp), %edx /* port */

5
kernel/arch/i386/io_outl.S
View File

@@ -1,10 +1,9 @@
/* outl() - Output one dword Author: Kees J. Bot */
/* 18 Mar 1996 */
/* void outl(U16_t port, u32_t value); */
#include <machine/asm.h>
.text
.globl _outl
_outl:
ENTRY(outl)
push %ebp
movl %esp, %ebp
movl 8(%ebp), %edx /* port */

5
kernel/arch/i386/io_outw.S
View File

@@ -1,10 +1,9 @@
/* outw() - Output one word Author: Kees J. Bot */
/* 18 Mar 1996 */
/* void outw(U16_t port, U16_t value); */
#include <machine/asm.h>
.text
.globl _outw
_outw:
ENTRY(outw)
push %ebp
movl %esp, %ebp
movl 8(%ebp), %edx /* port */

262
kernel/arch/i386/klib.S
View File

@@ -3,6 +3,7 @@
#include <minix/config.h>
#include <minix/const.h>
#include <machine/asm.h>
#include <machine/interrupt.h>
#include <i386/vm.h>
#include "archconst.h"
@@ -12,52 +13,9 @@
/*
* This file contains a number of assembly code utility routines needed by the
* kernel. They are:
* kernel.
*/
.globl _monitor/* exit Minix and return to the monitor */
.globl _int86 /* let the monitor make an 8086 interrupt call */
#ifdef __ACK__
.globl _exit /* dummy for library routines */
.globl __exit /* dummy for library routines */
.globl ___exit /* dummy for library routines */
#endif
.globl ___main /* dummy for GCC */
.globl _phys_insw /* transfer data from (disk controller) port to memory */
.globl _phys_insb /* likewise byte by byte */
.globl _phys_outsw /* transfer data from memory to (disk controller) port */
.globl _phys_outsb /* likewise byte by byte */
.globl _phys_copy /* copy data from anywhere to anywhere in memory */
.globl _phys_copy_fault /* phys_copy pagefault */
.globl _phys_copy_fault_in_kernel /* phys_copy pagefault in kernel */
.globl _phys_memset /* write pattern anywhere in memory */
.globl _mem_rdw /* copy one word from [segment:offset] */
.globl _reset /* reset the system */
.globl _halt_cpu/* halts the current cpu when idle */
.globl _read_cpu_flags /* read the cpu flags */
.globl _read_cr0 /* read cr0 */
.globl _read_cr2 /* read cr2 */
.globl _getcr3val
.globl _write_cr0 /* write a value in cr0 */
.globl _read_cr3
.globl _write_cr3
.globl _read_cr4
.globl _write_cr4
.globl _catch_pagefaults
.globl _read_ds
.globl _read_cs
.globl _read_ss
.globl _idt_reload /* reload idt when returning to monitor. */
.globl _fninit /* non-waiting FPU initialization */
.globl _fnstsw /* store status word (non-waiting) */
.globl _fnstcw /* store control word (non-waiting) */
.globl _fxsave
.globl _fnsave
.globl _fxrstor
.globl _frstor
.globl _clts
/*
* The routines only guarantee to preserve the registers the C compiler
@@ -65,15 +23,13 @@
* direction bit in the flags).
*/
.text
/*===========================================================================*/
/* monitor */
/*===========================================================================*/
/* PUBLIC void monitor(); */
/* Return to the monitor. */
_monitor:
movl _mon_sp, %esp /* restore monitor stack pointer */
/* exit Minix and return to the monitor */
ENTRY(monitor)
movl _C_LABEL(mon_sp), %esp /* restore monitor stack pointer */
movw $SS_SELECTOR, %dx /* monitor data segment */
mov %dx, %ds
mov %dx, %es
@@ -90,12 +46,13 @@ _monitor:
/* int86 */
/*===========================================================================*/
/* PUBLIC void int86(); */
_int86:
cmpb $0, _mon_return /* is the monitor there? */
/* let the monitor make an 8086 interrupt call */
ENTRY(int86)
cmpb $0, _C_LABEL(mon_return) /* is the monitor there? */
jne 0f
movb $0x01, %ah /* an int 13 error seems appropriate */
movb %ah, _reg86+0 /* reg86.w.f = 1 (set carry flag) */
movb %ah, _reg86+13 /* reg86.b.ah = 0x01 = "invalid command" */
movb %ah, _C_LABEL(reg86)+0 /* reg86.w.f = 1 (set carry flag) */
movb %ah, _C_LABEL(reg86)+13 /* reg86.b.ah = 0x01 = "invalid command" */
ret
0:
push %ebp /* save C registers */
@@ -109,7 +66,7 @@ _int86:
movb %al, %ah
inb $INT_CTLMASK
push %eax /* save interrupt masks */
movl _irq_use, %eax /* map of in-use IRQ's */
movl _C_LABEL(irq_use), %eax /* map of in-use IRQ's */
and $~(1<<CLOCK_IRQ), %eax /* keep the clock ticking */
outb $INT_CTLMASK /* enable all unused IRQ's and vv. */
movb %ah, %al
@@ -117,17 +74,17 @@ _int86:
mov $SS_SELECTOR, %eax /* monitor data segment */
mov %ax, %ss
xchgl _mon_sp, %esp /* switch stacks */
push _reg86+36 /* parameters used in INT call */
push _reg86+32
push _reg86+28
push _reg86+24
push _reg86+20
push _reg86+16
push _reg86+12
push _reg86+8
push _reg86+4
push _reg86+0
xchgl _C_LABEL(mon_sp), %esp /* switch stacks */
push _C_LABEL(reg86)+36 /* parameters used in INT call */
push _C_LABEL(reg86)+32
push _C_LABEL(reg86)+28
push _C_LABEL(reg86)+24
push _C_LABEL(reg86)+20
push _C_LABEL(reg86)+16
push _C_LABEL(reg86)+12
push _C_LABEL(reg86)+8
push _C_LABEL(reg86)+4
push _C_LABEL(reg86)+0
mov %ax, %ds /* remaining data selectors */
mov %ax, %es
mov %ax, %fs
@@ -136,17 +93,17 @@ _int86:
push $return /* kernel return address and selector */
ljmpw *20+2*4+10*4+2*4(%esp)
return:
pop _reg86+0
pop _reg86+4
pop _reg86+8
pop _reg86+12
pop _reg86+16
pop _reg86+20
pop _reg86+24
pop _reg86+28
pop _reg86+32
pop _reg86+36
lgdt _gdt+GDT_SELECTOR /* reload global descriptor table */
pop _C_LABEL(reg86)+0
pop _C_LABEL(reg86)+4
pop _C_LABEL(reg86)+8
pop _C_LABEL(reg86)+12
pop _C_LABEL(reg86)+16
pop _C_LABEL(reg86)+20
pop _C_LABEL(reg86)+24
pop _C_LABEL(reg86)+28
pop _C_LABEL(reg86)+32
pop _C_LABEL(reg86)+36
lgdt _C_LABEL(gdt)+GDT_SELECTOR /* reload global descriptor table */
ljmp $CS_SELECTOR, $csinit
csinit:
mov $DS_SELECTOR, %eax
@@ -155,8 +112,8 @@ csinit:
mov %ax, %fs
mov %ax, %gs
mov %ax, %ss
xchgl _mon_sp, %esp /* unswitch stacks */
lidt _gdt+IDT_SELECTOR /* reload interrupt descriptor table */
xchgl _C_LABEL(mon_sp), %esp /* unswitch stacks */
lidt _C_LABEL(gdt)+IDT_SELECTOR /* reload interrupt descriptor table */
#ifdef CONFIG_APIC
cmpl $0x0, lapic_addr
@@ -180,7 +137,7 @@ csinit:
shl $3, %eax
mov %eax, %ebx
add $TSS_SELECTOR, %eax
addl _gdt+DESC_ACCESS, %eax
addl _C_LABEL(gdt)+DESC_ACCESS, %eax
and $~0x02, %eax
ltr %bx /* set TSS register */
@@ -195,7 +152,7 @@ csinit:
outb $INT2_CTLMASK
6:
addl %ecx, _lost_ticks /* record lost clock ticks */
addl %ecx, _C_LABEL(lost_ticks) /* record lost clock ticks */
popf /* restore flags */
pop %ebx /* restore C registers */
@@ -214,14 +171,14 @@ csinit:
* GNU CC likes to call ___main from main() for nonobvious reasons.
*/
#ifdef __ACK__
_exit:
__exit:
___exit:
ENTRY(exit)
ENTRY(_exit)
ENTRY(__exit)
sti
jmp ___exit
jmp _C_LABEL(__exit)
#endif
___main:
ENTRY(__main)
ret
@@ -232,8 +189,8 @@ ___main:
* PUBLIC void phys_insw(Port_t port, phys_bytes buf, size_t count);
* Input an array from an I/O port. Absolute address version of insw().
*/
_phys_insw:
/* transfer data from (disk controller) port to memory */
ENTRY(phys_insw)
push %ebp
mov %esp, %ebp
cld
@@ -260,8 +217,8 @@ _phys_insw:
* PUBLIC void phys_insb(Port_t port, phys_bytes buf, size_t count);
* Input an array from an I/O port. Absolute address version of insb().
*/
_phys_insb:
/* transfer data from (disk controller) port to memory byte by byte */
ENTRY(phys_insb)
push %ebp
mov %esp, %ebp
cld
@@ -287,9 +244,8 @@ _phys_insb:
* PUBLIC void phys_outsw(Port_t port, phys_bytes buf, size_t count);
* Output an array to an I/O port. Absolute address version of outsw().
*/
.balign 16
_phys_outsw:
/* transfer data from memory to (disk controller) port */
ENTRY(phys_outsw)
push %ebp
mov %esp, %ebp
cld
@@ -316,9 +272,8 @@ _phys_outsw:
* PUBLIC void phys_outsb(Port_t port, phys_bytes buf, size_t count);
* Output an array to an I/O port. Absolute address version of outsb().
*/
.balign 16
_phys_outsb:
/* transfer data from memory to (disk controller) port byte by byte */
ENTRY(phys_outsb)
push %ebp
mov %esp, %ebp
cld
@@ -343,14 +298,11 @@ _phys_outsb:
/*
* PUBLIC phys_bytes phys_copy(phys_bytes source, phys_bytes destination,
* phys_bytes bytecount);
* Copy a block of physical memory.
* Copy a block of data from anywhere to anywhere in physical memory.
*/
PC_ARGS = 4+4+4+4 /* 4 + 4 + 4 */
/* es edi esi eip src dst len */
.balign 16
_phys_copy:
ENTRY(phys_copy)
cld
push %esi
push %edi
@@ -382,13 +334,13 @@ pc_small:
rep movsb %es:(%esi), %es:(%edi)
mov $0, %eax /* 0 means: no fault */
_phys_copy_fault: /* kernel can send us here */
LABEL(phys_copy_fault) /* kernel can send us here */
pop %es
pop %edi
pop %esi
ret
_phys_copy_fault_in_kernel: /* kernel can send us here */
LABEL(phys_copy_fault_in_kernel) /* kernel can send us here */
pop %es
pop %edi
pop %esi
@@ -417,10 +369,7 @@ _phys_copy_fault_in_kernel: /* kernel can send us here */
* wrong pointers from userspace and the caller should return an error to
* userspace as if wrong values or request were passed to the kernel
*/
.balign 16
.globl _copy_msg_from_user
_copy_msg_from_user:
ENTRY(copy_msg_from_user)
push %gs
mov 8(%esp), %eax
@@ -450,8 +399,7 @@ _copy_msg_from_user:
mov %gs:8*4(%ecx), %eax
mov %eax, 8*4(%edx)
.globl ___copy_msg_from_user_end
___copy_msg_from_user_end:
LABEL(__copy_msg_from_user_end)
pop %gs
@@ -470,10 +418,7 @@ ___copy_msg_from_user_end:
*
* All the other copy_msg_from_user() comments apply here as well!
*/
.balign 16
.globl _copy_msg_to_user
_copy_msg_to_user:
ENTRY(copy_msg_to_user)
push %gs
mov 8(%esp), %eax
@@ -503,8 +448,7 @@ _copy_msg_to_user:
mov 8*4(%ecx), %eax
mov %eax, %gs:8*4(%edx)
.globl ___copy_msg_to_user_end
___copy_msg_to_user_end:
LABEL(__copy_msg_to_user_end)
pop %gs
@@ -518,9 +462,7 @@ ___copy_msg_to_user_end:
* called from has to handle this situation. The exception handler redirect us
* here to continue, clean up and report the error
*/
.balign 16
.globl ___user_copy_msg_pointer_failure
___user_copy_msg_pointer_failure:
ENTRY(__user_copy_msg_pointer_failure)
pop %gs
movl $-1, %eax
@@ -534,9 +476,7 @@ ___user_copy_msg_pointer_failure:
* phys_bytes bytecount);
* Fill a block of physical memory with pattern.
*/
.balign 16
_phys_memset:
ENTRY(phys_memset)
push %ebp
mov %esp, %ebp
push %esi
@@ -581,9 +521,7 @@ fill_done:
* PUBLIC u16_t mem_rdw(U16_t segment, u16_t *offset);
* Load and return word at far pointer segment:offset.
*/
.balign 16
_mem_rdw:
ENTRY(mem_rdw)
mov %ds, %cx
mov 4(%esp), %ds
mov 4+4(%esp), %eax /* offset */
@@ -599,8 +537,7 @@ _mem_rdw:
* PUBLIC void reset();
* Reset the system by loading IDT with offset 0 and interrupting.
*/
_reset:
ENTRY(reset)
lidt idt_zero
int $3 /* anything goes, the 386 will not like it */
.data
@@ -617,7 +554,7 @@ idt_zero:
* reanables interrupts and puts the cpu in the halts state. Once an interrupt
* is handled the execution resumes by disabling interrupts and continues
*/
_halt_cpu:
ENTRY(halt_cpu)
sti
hlt /* interrupts enabled only after this instruction is executed! */
/*
@@ -633,48 +570,50 @@ _halt_cpu:
* PUBLIC unsigned long read_cpu_flags(void);
* Read CPU status flags from C.
*/
.balign 16
_read_cpu_flags:
ENTRY(read_cpu_flags)
pushf
mov (%esp), %eax
add $4, %esp
ret
_read_ds:
ENTRY(read_ds)
mov $0, %eax
mov %ds, %ax
ret
_read_cs:
ENTRY(read_cs)
mov $0, %eax
mov %cs, %ax
ret
_read_ss:
ENTRY(read_ss)
mov $0, %eax
mov %ss, %ax
ret
/*===========================================================================*/
/* fpu_routines */
/*===========================================================================*/
_fninit:
/* non-waiting FPU initialization */
ENTRY(fninit)
fninit
ret
_clts:
ENTRY(clts)
clts
ret
_fnstsw:
/* store status word (non-waiting) */
ENTRY(fnstsw)
xor %eax, %eax
/* DO NOT CHANGE THE OPERAND!!! gas2ack does not handle it yet */
fnstsw %ax
ret
_fnstcw:
/* store control word (non-waiting) */
ENTRY(fnstcw)
push %eax
mov 8(%esp), %eax
@@ -686,7 +625,7 @@ _fnstcw:
/*===========================================================================*/
/* fxsave */
/*===========================================================================*/
_fxsave:
ENTRY(fxsave)
mov 4(%esp), %eax
fxsave (%eax) /* Do not change the operand! (gas2ack) */
ret
@@ -694,7 +633,7 @@ _fxsave:
/*===========================================================================*/
/* fnsave */
/*===========================================================================*/
_fnsave:
ENTRY(fnsave)
mov 4(%esp), %eax
fnsave (%eax) /* Do not change the operand! (gas2ack) */
fwait /* required for compatibility with processors prior pentium */
@@ -703,7 +642,7 @@ _fnsave:
/*===========================================================================*/
/* fxrstor */
/*===========================================================================*/
_fxrstor:
ENTRY(fxrstor)
mov 4(%esp), %eax
fxrstor (%eax) /* Do not change the operand! (gas2ack) */
ret
@@ -711,7 +650,7 @@ _fxrstor:
/*===========================================================================*/
/* frstor */
/*===========================================================================*/
_frstor:
ENTRY(frstor)
mov 4(%esp), %eax
frstor (%eax) /* Do not change the operand! (gas2ack) */
ret
@@ -721,7 +660,7 @@ _frstor:
/* read_cr0 */
/*===========================================================================*/
/* PUBLIC unsigned long read_cr0(void); */
_read_cr0:
ENTRY(read_cr0)
push %ebp
mov %esp, %ebp
mov %cr0, %eax
@@ -732,7 +671,7 @@ _read_cr0:
/* write_cr0 */
/*===========================================================================*/
/* PUBLIC void write_cr0(unsigned long value); */
_write_cr0:
ENTRY(write_cr0)
push %ebp
mov %esp, %ebp
mov 8(%ebp), %eax
@@ -746,7 +685,7 @@ _write_cr0:
/* read_cr2 */
/*===========================================================================*/
/* PUBLIC reg_t read_cr2(void); */
_read_cr2:
ENTRY(read_cr2)
mov %cr2, %eax
ret
@@ -754,7 +693,7 @@ _read_cr2:
/* read_cr3 */
/*===========================================================================*/
/* PUBLIC unsigned long read_cr3(void); */
_read_cr3:
ENTRY(read_cr3)
push %ebp
mov %esp, %ebp
@@ -767,7 +706,7 @@ _read_cr3:
/* read_cr4 */
/*===========================================================================*/
/* PUBLIC unsigned long read_cr4(void); */
_read_cr4:
ENTRY(read_cr4)
push %ebp
mov %esp, %ebp
@@ -780,7 +719,7 @@ _read_cr4:
/* write_cr4 */
/*===========================================================================*/
/* PUBLIC void write_cr4(unsigned long value); */
_write_cr4:
ENTRY(write_cr4)
push %ebp
mov %esp, %ebp
mov 8(%ebp), %eax
@@ -796,7 +735,7 @@ _write_cr4:
/* write_cr3 */
/*===========================================================================*/
/* PUBLIC void write_cr3(unsigned long value); */
_write_cr3:
ENTRY(write_cr3)
push %ebp
mov %esp, %ebp
mov 8(%ebp), %eax
@@ -811,7 +750,7 @@ _write_cr3:
/* getcr3val */
/*===========================================================================*/
/* PUBLIC unsigned long getcr3val(void); */
_getcr3val:
ENTRY(getcr3val)
mov %cr3, %eax
ret
@@ -820,8 +759,7 @@ _getcr3val:
*
* void ia32_msr_read(u32_t reg, u32_t * hi, u32_t * lo)
*/
.globl _ia32_msr_read
_ia32_msr_read:
ENTRY(ia32_msr_read)
push %ebp
mov %esp, %ebp
@@ -840,8 +778,7 @@ _ia32_msr_read:
*
* void ia32_msr_write(u32_t reg, u32_t hi, u32_t lo)
*/
.globl _ia32_msr_write
_ia32_msr_write:
ENTRY(ia32_msr_write)
push %ebp
mov %esp, %ebp
@@ -857,9 +794,9 @@ _ia32_msr_write:
/* idt_reload */
/*===========================================================================*/
/* PUBLIC void idt_reload (void); */
.balign 16
_idt_reload:
lidt _gdt+IDT_SELECTOR /* reload interrupt descriptor table */
/* reload idt when returning to monitor. */
ENTRY(idt_reload)
lidt _C_LABEL(gdt)+IDT_SELECTOR /* reload interrupt descriptor table */
ret
/*
@@ -870,8 +807,7 @@ _idt_reload:
mov reg, %ax ;\
mov %ax, reg ;
.globl _reload_ds
_reload_ds:
ENTRY(reload_ds)
RELOAD_SEG_REG(%ds)
ret
@@ -884,10 +820,7 @@ _reload_ds:
* same value in which case it would only result in an extra TLB flush which is
* not desirable
*/
.balign 16
.globl _switch_address_space
_switch_address_space:
ENTRY(switch_address_space)
/* read the process pointer */
mov 4(%esp), %edx
/* enable process' segment descriptors */
@@ -906,7 +839,7 @@ _switch_address_space:
cmp %ecx, %eax
je 0f
mov %eax, %cr3
mov %edx, _ptproc
mov %edx, _C_LABEL(ptproc)
0:
ret
@@ -915,11 +848,10 @@ _switch_address_space:
/*===========================================================================*/
/* PUBLIC void poweroff(); */
/* Jump to 16-bit poweroff code */
.globl _poweroff_jmp
_poweroff_jmp:
ENTRY(poweroff_jmp)
cli
/* Make real mode descriptor */
mov $(_gdt + SS_SELECTOR), %edi
mov $(_C_LABEL(gdt) + SS_SELECTOR), %edi
mov $0x100, %eax
movw %ax, 2(%edi)
shr $16, %eax

14
kernel/arch/i386/klib16.S
View File

@@ -3,6 +3,7 @@
#include <minix/config.h>
#include <minix/const.h>
#include <machine/asm.h>
#include <machine/interrupt.h>
#include "archconst.h"
#include "kernel/const.h"
@@ -11,12 +12,9 @@
/*
* This file contains a number of 16-bit assembly code utility routines needed by the
* kernel. They are:
* kernel.
*/
.globl _poweroff16 /* enter real mode */
.globl _poweroff16_end
.text
.code16
@@ -25,10 +23,10 @@
/*===========================================================================*/
/* PUBLIC void poweroff16(); */
/* Power down system */
_poweroff16:
ENTRY(poweroff16)
/* Assume eax is already set to required value of cr0*/
.byte 0x0F,0x22,0xC0 /* mov %cr0,%eax */
ljmp $0,$(BIOS_POWEROFF_ENTRY + real_mode - _poweroff16)
ljmp $0,$(BIOS_POWEROFF_ENTRY + real_mode - _C_LABEL(poweroff16))
real_mode:
mov $((BIOS_POWEROFF_ENTRY >> 4) + 0x200),%ax
mov %ax, %ds
@@ -88,7 +86,7 @@ apm_err:
mov $0x07, %bx
mov $POWEROFF_MSG_LEN, %cx
mov $0x0300, %dx
mov $(poweroff_msg - _poweroff16), %bp
mov $(poweroff_msg - _C_LABEL(poweroff16)), %bp
int $0x10
0: hlt
jmp 0b
@@ -99,4 +97,4 @@ kb_wait:
jnz kb_wait
ret
/*mark the end for copy*/
_poweroff16_end:
LABEL(poweroff16_end)

236
kernel/arch/i386/mpx.S
View File

@@ -47,6 +47,7 @@ begbss:
#include <minix/config.h>
#include <minix/const.h>
#include <minix/com.h>
#include <machine/asm.h>
#include <machine/interrupt.h>
#include "archconst.h"
#include "kernel/const.h"
@@ -57,59 +58,11 @@ begbss:
/* Selected 386 tss offsets. */
#define TSS3_S_SP0 4
/*
* Exported functions
* Note: in assembly language the .define statement applied to a function name
* is loosely equivalent to a prototype in C code -- it makes it possible to
* link to an entity declared in the assembly code but does not create
* the entity.
*/
.globl _restore_user_context
.globl _copr_not_available_handler
.globl _reload_cr3
.globl _divide_error
.globl _single_step_exception
.globl _nmi
.globl _breakpoint_exception
.globl _overflow
.globl _bounds_check
.globl _inval_opcode
.globl _copr_not_available
.globl _double_fault
.globl _copr_seg_overrun
.globl _inval_tss
.globl _segment_not_present
.globl _stack_exception
.globl _general_protection
.globl _page_fault
.globl _copr_error
.globl _alignment_check
.globl _machine_check
.globl _simd_exception
.globl _params_size
.globl _params_offset
.globl _mon_ds
.globl _switch_to_user
.globl _save_fpu
.globl _hwint00 /* handlers for hardware interrupts */
.globl _hwint01
.globl _hwint02
.globl _hwint03
.globl _hwint04
.globl _hwint05
.globl _hwint06
.globl _hwint07
.globl _hwint08
.globl _hwint09
.globl _hwint10
.globl _hwint11
.globl _hwint12
.globl _hwint13
.globl _hwint14
.globl _hwint15
IMPORT(copr_not_available_handler)
IMPORT(params_size)
IMPORT(params_offset)
IMPORT(mon_ds)
IMPORT(switch_to_user)
/* Exported variables. */
.globl begbss
@@ -178,16 +131,16 @@ kernel_init: /* after pre-init*/
push %edi
cmp $0, 4(%ebp) /* monitor return vector is */
je noret /* nonzero if return possible */
incl _mon_return
incl _C_LABEL(mon_return)
noret:
movl %esp, _mon_sp /* save stack pointer for later return */
movl %esp, _C_LABEL(mon_sp) /* save stack pointer for later return */
/* Copy the monitor global descriptor table to the address space of kernel and */
/* switch over to it. Prot_init() can then update it with immediate effect. */
sgdt _gdt+GDT_SELECTOR /* get the monitor gdtr */
movl _gdt+GDT_SELECTOR+2, %esi /* absolute address of GDT */
mov $_gdt, %ebx /* address of kernel GDT */
sgdt _C_LABEL(gdt)+GDT_SELECTOR /* get the monitor gdtr */
movl _C_LABEL(gdt)+GDT_SELECTOR+2, %esi /* absolute address of GDT */
mov $_C_LABEL(gdt), %ebx /* address of kernel GDT */
mov $8*8, %ecx /* copying eight descriptors */
copygdt:
movb %es:(%esi), %al
@@ -195,28 +148,28 @@ copygdt:
inc %esi
inc %ebx
loop copygdt
movl _gdt+DS_SELECTOR+2, %eax /* base of kernel data */
movl _C_LABEL(gdt)+DS_SELECTOR+2, %eax /* base of kernel data */
and $0x00FFFFFF, %eax /* only 24 bits */
add $_gdt, %eax /* eax = vir2phys(gdt) */
movl %eax, _gdt+GDT_SELECTOR+2 /* set base of GDT */
lgdt _gdt+GDT_SELECTOR /* switch over to kernel GDT */
add $_C_LABEL(gdt), %eax /* eax = vir2phys(gdt) */
movl %eax, _C_LABEL(gdt)+GDT_SELECTOR+2 /* set base of GDT */
lgdt _C_LABEL(gdt)+GDT_SELECTOR /* switch over to kernel GDT */
/* Locate boot parameters, set up kernel segment registers and stack. */
mov 8(%ebp), %ebx /* boot parameters offset */
mov 12(%ebp), %edx /* boot parameters length */
mov 16(%ebp), %eax /* address of a.out headers */
movl %eax, _aout
movl %eax, _C_LABEL(aout)
mov %ds, %ax /* kernel data */
mov %ax, %es
mov %ax, %fs
mov %ax, %gs
mov %ax, %ss
mov $_k_boot_stktop, %esp /* set sp to point to the top of kernel stack */
mov $_C_LABEL(k_boot_stktop), %esp /* set sp to point to the top of kernel stack */
/* Save boot parameters into these global variables for i386 code */
movl %edx, _params_size
movl %ebx, _params_offset
movl $SS_SELECTOR, _mon_ds
movl %edx, _C_LABEL(params_size)
movl %ebx, _C_LABEL(params_offset)
movl $SS_SELECTOR, _C_LABEL(mon_ds)
/* Call C startup code to set up a proper environment to run main(). */
push %edx
@@ -224,14 +177,14 @@ copygdt:
push $SS_SELECTOR
push $DS_SELECTOR
push $CS_SELECTOR
call _cstart /* cstart(cs, ds, mds, parmoff, parmlen) */
call _C_LABEL(cstart) /* cstart(cs, ds, mds, parmoff, parmlen) */
add $5*4, %esp
/* Reload gdtr, idtr and the segment registers to global descriptor table set */
/* up by prot_init(). */
lgdt _gdt+GDT_SELECTOR
lidt _gdt+IDT_SELECTOR
lgdt _C_LABEL(gdt)+GDT_SELECTOR
lidt _C_LABEL(gdt)+IDT_SELECTOR
ljmp $CS_SELECTOR, $csinit
csinit:
@@ -245,7 +198,7 @@ csinit:
ltr %ax
push $0 /* set flags to known good state */
popf /* esp, clear nested task and int enable */
jmp _main /* main() */
jmp _C_LABEL(main) /* main() */
/*===========================================================================*/
@@ -255,7 +208,7 @@ csinit:
#define PIC_IRQ_HANDLER(irq) \
push $irq ;\
call _irq_handle /* intr_handle(irq_handlers[irq]) */ ;\
call _C_LABEL(irq_handle) /* intr_handle(irq_handlers[irq]) */ ;\
add $4, %esp ;
/*===========================================================================*/
@@ -269,16 +222,16 @@ csinit:
SAVE_PROCESS_CTX(0) ;\
push %ebp ;\
movl $0, %ebp /* for stack trace */ ;\
call _context_stop ;\
call _C_LABEL(context_stop) ;\
add $4, %esp ;\
PIC_IRQ_HANDLER(irq) ;\
movb $END_OF_INT, %al ;\
outb $INT_CTL /* reenable interrupts in master pic */ ;\
jmp _switch_to_user ;\
jmp _C_LABEL(switch_to_user) ;\
\
0: \
pusha ;\
call _context_stop_idle ;\
call _C_LABEL(context_stop_idle) ;\
PIC_IRQ_HANDLER(irq) ;\
movb $END_OF_INT, %al ;\
outb $INT_CTL /* reenable interrupts in master pic */ ;\
@@ -287,43 +240,35 @@ csinit:
iret ;
/* Each of these entry points is an expansion of the hwint_master macro */
.balign 16
_hwint00:
ENTRY(hwint00)
/* Interrupt routine for irq 0 (the clock). */
hwint_master(0)
.balign 16
_hwint01:
ENTRY(hwint01)
/* Interrupt routine for irq 1 (keyboard) */
hwint_master(1)
.balign 16
_hwint02:
ENTRY(hwint02)
/* Interrupt routine for irq 2 (cascade!) */
hwint_master(2)
.balign 16
_hwint03:
ENTRY(hwint03)
/* Interrupt routine for irq 3 (second serial) */
hwint_master(3)
.balign 16
_hwint04:
ENTRY(hwint04)
/* Interrupt routine for irq 4 (first serial) */
hwint_master(4)
.balign 16
_hwint05:
ENTRY(hwint05)
/* Interrupt routine for irq 5 (XT winchester) */
hwint_master(5)
.balign 16
_hwint06:
ENTRY(hwint06)
/* Interrupt routine for irq 6 (floppy) */
hwint_master(6)
.balign 16
_hwint07:
ENTRY(hwint07)
/* Interrupt routine for irq 7 (printer) */
hwint_master(7)
@@ -337,17 +282,17 @@ _hwint07:
SAVE_PROCESS_CTX(0) ;\
push %ebp ;\
movl $0, %ebp /* for stack trace */ ;\
call _context_stop ;\
call _C_LABEL(context_stop) ;\
add $4, %esp ;\
PIC_IRQ_HANDLER(irq) ;\
movb $END_OF_INT, %al ;\
outb $INT_CTL /* reenable interrupts in master pic */ ;\
outb $INT2_CTL /* reenable slave 8259 */ ;\
jmp _switch_to_user ;\
jmp _C_LABEL(switch_to_user) ;\
\
0: \
pusha ;\
call _context_stop_idle ;\
call _C_LABEL(context_stop_idle) ;\
PIC_IRQ_HANDLER(irq) ;\
movb $END_OF_INT, %al ;\
outb $INT_CTL /* reenable interrupts in master pic */ ;\
@@ -357,52 +302,42 @@ _hwint07:
iret ;
/* Each of these entry points is an expansion of the hwint_slave macro */
.balign 16
_hwint08:
ENTRY(hwint08)
/* Interrupt routine for irq 8 (realtime clock) */
hwint_slave(8)
.balign 16
_hwint09:
ENTRY(hwint09)
/* Interrupt routine for irq 9 (irq 2 redirected) */
hwint_slave(9)
.balign 16
_hwint10:
ENTRY(hwint10)
/* Interrupt routine for irq 10 */
hwint_slave(10)
.balign 16
_hwint11:
ENTRY(hwint11)
/* Interrupt routine for irq 11 */
hwint_slave(11)
.balign 16
_hwint12:
ENTRY(hwint12)
/* Interrupt routine for irq 12 */
hwint_slave(12)
.balign 16
_hwint13:
ENTRY(hwint13)
/* Interrupt routine for irq 13 (FPU exception) */
hwint_slave(13)
.balign 16
_hwint14:
ENTRY(hwint14)
/* Interrupt routine for irq 14 (AT winchester) */
hwint_slave(14)
.balign 16
_hwint15:
ENTRY(hwint15)
/* Interrupt routine for irq 15 */
hwint_slave(15)
/*
* IPC is only from a process to kernel
*/
.balign 16
.globl _ipc_entry
_ipc_entry:
ENTRY(ipc_entry)
SAVE_PROCESS_CTX(0)
@@ -422,25 +357,23 @@ _ipc_entry:
push %ebp
/* for stack trace */
movl $0, %ebp
call _context_stop
call _C_LABEL(context_stop)
add $4, %esp
call _do_ipc
call _C_LABEL(do_ipc)
/* restore the current process pointer and save the return value */
add $3 * 4, %esp
pop %esi
mov %eax, AXREG(%esi)
jmp _switch_to_user
jmp _C_LABEL(switch_to_user)
/*
* kernel call is only from a process to kernel
*/
.balign 16
.globl _kernel_call_entry
_kernel_call_entry:
ENTRY(kernel_call_entry)
SAVE_PROCESS_CTX(0)
@@ -458,15 +391,15 @@ _kernel_call_entry:
push %ebp
/* for stack trace */
movl $0, %ebp
call _context_stop
call _C_LABEL(context_stop)
add $4, %esp
call _kernel_call
call _C_LABEL(kernel_call)
/* restore the current process pointer and save the return value */
add $8, %esp
jmp _switch_to_user
jmp _C_LABEL(switch_to_user)
.balign 16
@@ -490,7 +423,7 @@ exception_entry_from_user:
push %ebp
/* for stack trace clear %ebp */
movl $0, %ebp
call _context_stop
call _C_LABEL(context_stop)
add $4, %esp
/*
@@ -500,9 +433,9 @@ exception_entry_from_user:
*/
push %esp
push $0 /* it's not a nested exception */
call _exception_handler
call _C_LABEL(exception_handler)
jmp _switch_to_user
jmp _C_LABEL(switch_to_user)
exception_entry_nested:
@@ -511,7 +444,7 @@ exception_entry_nested:
add $(8 * 4), %eax
push %eax
pushl $1 /* it's a nested exception */
call _exception_handler
call _C_LABEL(exception_handler)
add $8, %esp
popa
@@ -523,7 +456,7 @@ exception_entry_nested:
/*===========================================================================*/
/* restart */
/*===========================================================================*/
_restore_user_context:
ENTRY(restore_user_context)
mov 4(%esp), %ebp /* will assume P_STACKBASE == 0 */
/* reconstruct the stack for iret */
@@ -558,13 +491,13 @@ _restore_user_context:
pushl $0 ;\
EXCEPTION_ERR_CODE(vector)
_divide_error:
LABEL(divide_error)
EXCEPTION_NO_ERR_CODE(DIVIDE_VECTOR)
_single_step_exception:
LABEL(single_step_exception)
EXCEPTION_NO_ERR_CODE(DEBUG_VECTOR)
_nmi:
LABEL(nmi)
#ifndef CONFIG_WATCHDOG
EXCEPTION_NO_ERR_CODE(NMI_VECTOR)
#else
@@ -597,7 +530,7 @@ _nmi:
mov %si, %es
push %esp
call _nmi_watchdog_handler
call _C_LABEL(nmi_watchdog_handler)
add $4, %esp
/* restore all the important registers as they were before the trap */
@@ -610,71 +543,71 @@ _nmi:
iret
#endif
_breakpoint_exception:
LABEL(breakpoint_exception)
EXCEPTION_NO_ERR_CODE(BREAKPOINT_VECTOR)
_overflow:
LABEL(overflow)
EXCEPTION_NO_ERR_CODE(OVERFLOW_VECTOR)
_bounds_check:
LABEL(bounds_check)
EXCEPTION_NO_ERR_CODE(BOUNDS_VECTOR)
_inval_opcode:
LABEL(inval_opcode)
EXCEPTION_NO_ERR_CODE(INVAL_OP_VECTOR)
_copr_not_available:
LABEL(copr_not_available)
TEST_INT_IN_KERNEL(4, copr_not_available_in_kernel)
cld /* set direction flag to a known value */
SAVE_PROCESS_CTX(0)
/* stop user process cycles */
push %ebp
mov $0, %ebp
call _context_stop
jmp _copr_not_available_handler
call _C_LABEL(context_stop)
jmp _C_LABEL(copr_not_available_handler)
copr_not_available_in_kernel:
pushl $0
pushl $COPROC_NOT_VECTOR
jmp exception_entry_nested
_double_fault:
LABEL(double_fault)
EXCEPTION_ERR_CODE(DOUBLE_FAULT_VECTOR)
_copr_seg_overrun:
LABEL(copr_seg_overrun)
EXCEPTION_NO_ERR_CODE(COPROC_SEG_VECTOR)
_inval_tss:
LABEL(inval_tss)
EXCEPTION_ERR_CODE(INVAL_TSS_VECTOR)
_segment_not_present:
LABEL(segment_not_present)
EXCEPTION_ERR_CODE(SEG_NOT_VECTOR)
_stack_exception:
LABEL(stack_exception)
EXCEPTION_ERR_CODE(STACK_FAULT_VECTOR)
_general_protection:
LABEL(general_protection)
EXCEPTION_ERR_CODE(PROTECTION_VECTOR)
_page_fault:
LABEL(page_fault)
EXCEPTION_ERR_CODE(PAGE_FAULT_VECTOR)
_copr_error:
LABEL(copr_error)
EXCEPTION_NO_ERR_CODE(COPROC_ERR_VECTOR)
_alignment_check:
LABEL(alignment_check)
EXCEPTION_NO_ERR_CODE(ALIGNMENT_CHECK_VECTOR)
_machine_check:
LABEL(machine_check)
EXCEPTION_NO_ERR_CODE(MACHINE_CHECK_VECTOR)
_simd_exception:
LABEL(simd_exception)
EXCEPTION_NO_ERR_CODE(SIMD_EXCEPTION_VECTOR)
/*===========================================================================*/
/* reload_cr3 */
/*===========================================================================*/
/* PUBLIC void reload_cr3(void); */
_reload_cr3:
ENTRY(reload_cr3)
push %ebp
mov %esp, %ebp
mov %cr3, %eax
@@ -696,7 +629,6 @@ _reload_cr3:
/*
* the kernel stack
*/
.globl _k_boot_stktop
k_boot_stack:
.space 4096 /* kernel stack */ /* FIXME use macro here */
_k_boot_stktop: /* top of kernel stack */
LABEL(k_boot_stktop) /* top of kernel stack */

34
kernel/arch/i386/multiboot.S
View File

@@ -2,6 +2,7 @@
#include <minix/config.h>
#include <minix/const.h>
#include <minix/com.h>
#include <machine/asm.h>
#include <machine/interrupt.h>
#include "archconst.h"
#include "kernel/const.h"
@@ -11,7 +12,7 @@
#define GDT_SET_ENTRY(selector, base, limit) \
mov %ebp, %edi; \
add $(_gdt + selector), %edi; \
add $(_C_LABEL(gdt) + selector), %edi; \
mov base, %eax; \
movw %ax, 2(%edi); \
shr $16, %eax; \
@@ -26,10 +27,10 @@
andb $0xf0, 6(%edi); \
or %ax, 6(%edi); \
.globl _pre_init
.globl multiboot_init
.globl kernel_init
IMPORT(pre_init)
.extern kernel_init
.globl multiboot_init
multiboot_init:
/* Get size of kernel text */
mov MULTIBOOT_LOAD_ADDRESS + MULTIBOOT_KERNEL_a_text, %ecx
@@ -44,7 +45,7 @@ multiboot_init:
/* Calculate and save kernel data base address */
mov $(MULTIBOOT_LOAD_ADDRESS + MULTIBOOT_ENTRY_OFFSET), %ebp
add %eax, %ebp
mov %ebp, _kernel_data_addr(%ebp)
mov %ebp, _C_LABEL(kernel_data_addr)(%ebp)
/* Init text seg */
GDT_SET_ENTRY(CS_SELECTOR, \
@@ -68,10 +69,10 @@ multiboot_init:
mov $(GDT_SIZE*DESC_SIZE), %eax
mov %ebp, %edi
add $(_gdt + GDT_SELECTOR), %edi
add $(_C_LABEL(gdt) + GDT_SELECTOR), %edi
mov %ax, (%edi)
mov %ebp, %eax
add $_gdt, %eax
add $_C_LABEL(gdt), %eax
mov %eax, 2(%edi)
lgdt (%edi)
@@ -86,14 +87,14 @@ reload_cs:
mov $(multiboot_stack + MULTIBOOT_STACK_SIZE), %esp
push %ebx
call _pre_init
call _C_LABEL(pre_init)
add $4, %esp
/* return to old boot code of kernel */
push %eax
push $MULTIBOOT_PARAM_BUF_SIZE
push $_multiboot_param_buf
push $_C_LABEL(multiboot_param_buf)
push $0
mov $ES_SELECTOR, %eax
@@ -102,16 +103,13 @@ reload_cs:
jmp kernel_init
.data
.globl _kernel_data_addr
_kernel_data_addr:
.long 0
.globl _a_out_headers
_a_out_headers:
.space NR_BOOT_PROCS * 32 /* is A_MINHDR */
LABEL(kernel_data_addr)
.long 0
LABEL(a_out_headers)
.space NR_BOOT_PROCS * 32 /* is A_MINHDR */
.globl _multiboot_param_buf
_multiboot_param_buf:
.space MULTIBOOT_PARAM_BUF_SIZE
LABEL(multiboot_param_buf)
.space MULTIBOOT_PARAM_BUF_SIZE
multiboot_stack:
.space MULTIBOOT_STACK_SIZE + 4