Moved CPU code shared by x86 and x64 into x86-family.
This commit is contained in:
parent
4728809c00
commit
9995354f95
|
@ -26,7 +26,8 @@ ifdef X86FAMILY
|
||||||
CPUOBJS:=$(CPUOBJS) \
|
CPUOBJS:=$(CPUOBJS) \
|
||||||
$(CPU)/memorymanagement-asm.o \
|
$(CPU)/memorymanagement-asm.o \
|
||||||
$(CPU)/interrupt.o \
|
$(CPU)/interrupt.o \
|
||||||
$(CPU)/gdt.o
|
$(CPU)/gdt.o \
|
||||||
|
x86-family/x86-family.o
|
||||||
CPUFLAGS:=$(CPUFLAGS) -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow
|
CPUFLAGS:=$(CPUFLAGS) -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -42,7 +43,7 @@ DEFINES:=$(DEFINES) -DPLATFORM_KERNEL_HEAP
|
||||||
DEFINES:=$(DEFINES) -DINITRD
|
DEFINES:=$(DEFINES) -DINITRD
|
||||||
CPPFLAGSRELEASE=-s -O3
|
CPPFLAGSRELEASE=-s -O3
|
||||||
CPPFLAGSDEBUG=
|
CPPFLAGSDEBUG=
|
||||||
CPPFLAGS=-I.. $(CPUDEFINES) $(CPUFLAGS) -std=gnu++0x -Wall -Wextra -nostdlib -fno-builtin -nostartfiles -nodefaultlibs -fno-exceptions -fno-rtti -fno-stack-protector $(DEFINES) $(CPPFLAGSRELEASE)
|
CPPFLAGS=-I.. -I. $(CPUDEFINES) $(CPUFLAGS) -std=gnu++0x -Wall -Wextra -nostdlib -fno-builtin -nostartfiles -nodefaultlibs -fno-exceptions -fno-rtti -fno-stack-protector $(DEFINES) $(CPPFLAGSRELEASE)
|
||||||
OBJS=$(CPUOBJS) kernel.o descriptor_tables.o isr.o time.o log.o iprintable.o panic.o keyboard.o memorymanagement.o scheduler.o syscall.o application.o pong.o sound.o pci.o uart.o conway.o test.o http.o vgaterminal.o serialterminal.o descriptors.o device.o vga.o ../libmaxsi/libmaxsi-sortix.a
|
OBJS=$(CPUOBJS) kernel.o descriptor_tables.o isr.o time.o log.o iprintable.o panic.o keyboard.o memorymanagement.o scheduler.o syscall.o application.o pong.o sound.o pci.o uart.o conway.o test.o http.o vgaterminal.o serialterminal.o descriptors.o device.o vga.o ../libmaxsi/libmaxsi-sortix.a
|
||||||
JSOBJS:=$(subst .o,-js.o,$(OBJS))
|
JSOBJS:=$(subst .o,-js.o,$(OBJS))
|
||||||
|
|
||||||
|
|
|
@ -29,40 +29,5 @@ namespace Sortix
|
||||||
{
|
{
|
||||||
namespace X64
|
namespace X64
|
||||||
{
|
{
|
||||||
void OutPortB(uint16_t Port, uint8_t Value)
|
|
||||||
{
|
|
||||||
asm volatile ("outb %1, %0" : : "dN" (Port), "a" (Value));
|
|
||||||
}
|
|
||||||
|
|
||||||
void OutPortW(uint16_t Port, uint16_t Value)
|
|
||||||
{
|
|
||||||
asm volatile ("outw %1, %0" : : "dN" (Port), "a" (Value));
|
|
||||||
}
|
|
||||||
|
|
||||||
void OutPortL(uint16_t Port, uint32_t Value)
|
|
||||||
{
|
|
||||||
asm volatile ("outl %1, %0" : : "dN" (Port), "a" (Value));
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t InPortB(uint16_t Port)
|
|
||||||
{
|
|
||||||
uint8_t Result;
|
|
||||||
asm volatile("inb %1, %0" : "=a" (Result) : "dN" (Port));
|
|
||||||
return Result;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t InPortW(uint16_t Port)
|
|
||||||
{
|
|
||||||
uint16_t Result;
|
|
||||||
asm volatile("inw %1, %0" : "=a" (Result) : "dN" (Port));
|
|
||||||
return Result;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t InPortL(uint16_t Port)
|
|
||||||
{
|
|
||||||
uint32_t Result;
|
|
||||||
asm volatile("inl %1, %0" : "=a" (Result) : "dN" (Port));
|
|
||||||
return Result;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
You should have received a copy of the GNU General Public License along
|
You should have received a copy of the GNU General Public License along
|
||||||
with Sortix. If not, see <http://www.gnu.org/licenses/>.
|
with Sortix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
x64
|
x64.h
|
||||||
CPU stuff for the x64 platform.
|
CPU stuff for the x64 platform.
|
||||||
|
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
@ -25,17 +25,12 @@
|
||||||
#ifndef SORTIX_X64_H
|
#ifndef SORTIX_X64_H
|
||||||
#define SORTIX_X64_H
|
#define SORTIX_X64_H
|
||||||
|
|
||||||
|
#include "../x86-family/x86-family.h"
|
||||||
|
|
||||||
namespace Sortix
|
namespace Sortix
|
||||||
{
|
{
|
||||||
namespace X64
|
namespace X64
|
||||||
{
|
{
|
||||||
void OutPortB(uint16_t Port, uint8_t Value);
|
|
||||||
void OutPortW(uint16_t Port, uint16_t Value);
|
|
||||||
void OutPortL(uint16_t Port, uint32_t Value);
|
|
||||||
uint8_t InPortB(uint16_t Port);
|
|
||||||
uint16_t InPortW(uint16_t Port);
|
|
||||||
uint32_t InPortL(uint16_t Port);
|
|
||||||
|
|
||||||
struct InterruptRegisters
|
struct InterruptRegisters
|
||||||
{
|
{
|
||||||
uint64_t cr2;
|
uint64_t cr2;
|
||||||
|
|
|
@ -0,0 +1,102 @@
|
||||||
|
/******************************************************************************
|
||||||
|
|
||||||
|
COPYRIGHT(C) JONAS 'SORTIE' TERMANSEN 2011.
|
||||||
|
|
||||||
|
This file is part of Sortix.
|
||||||
|
|
||||||
|
Sortix is free software: you can redistribute it and/or modify it under the
|
||||||
|
terms of the GNU General Public License as published by the Free Software
|
||||||
|
Foundation, either version 3 of the License, or (at your option) any later
|
||||||
|
version.
|
||||||
|
|
||||||
|
Sortix is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||||
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||||
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||||
|
details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with Sortix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
x86-family.cpp
|
||||||
|
CPU stuff for the x86 CPU family.
|
||||||
|
|
||||||
|
******************************************************************************/
|
||||||
|
|
||||||
|
#include <libmaxsi/platform.h>
|
||||||
|
|
||||||
|
namespace Sortix
|
||||||
|
{
|
||||||
|
namespace CPU
|
||||||
|
{
|
||||||
|
void OutPortB(uint16_t Port, uint8_t Value)
|
||||||
|
{
|
||||||
|
asm volatile ("outb %1, %0" : : "dN" (Port), "a" (Value));
|
||||||
|
}
|
||||||
|
|
||||||
|
void OutPortW(uint16_t Port, uint16_t Value)
|
||||||
|
{
|
||||||
|
asm volatile ("outw %1, %0" : : "dN" (Port), "a" (Value));
|
||||||
|
}
|
||||||
|
|
||||||
|
void OutPortL(uint16_t Port, uint32_t Value)
|
||||||
|
{
|
||||||
|
asm volatile ("outl %1, %0" : : "dN" (Port), "a" (Value));
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t InPortB(uint16_t Port)
|
||||||
|
{
|
||||||
|
uint8_t Result;
|
||||||
|
asm volatile("inb %1, %0" : "=a" (Result) : "dN" (Port));
|
||||||
|
return Result;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint16_t InPortW(uint16_t Port)
|
||||||
|
{
|
||||||
|
uint16_t Result;
|
||||||
|
asm volatile("inw %1, %0" : "=a" (Result) : "dN" (Port));
|
||||||
|
return Result;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t InPortL(uint16_t Port)
|
||||||
|
{
|
||||||
|
uint32_t Result;
|
||||||
|
asm volatile("inl %1, %0" : "=a" (Result) : "dN" (Port));
|
||||||
|
return Result;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Reboot()
|
||||||
|
{
|
||||||
|
// Keyboard interface IO port: data and control.
|
||||||
|
const uint16_t KEYBOARD_INTERFACE = 0x64;
|
||||||
|
|
||||||
|
// Keyboard IO port.
|
||||||
|
const uint16_t KEYBOARD_IO = 0x60;
|
||||||
|
|
||||||
|
// Keyboard data is in buffer (output buffer is empty) (bit 0).
|
||||||
|
const uint8_t KEYBOARD_DATA = (1<<0);
|
||||||
|
|
||||||
|
// User data is in buffer (command buffer is empty) (bit 1).
|
||||||
|
const uint8_t USER_DATA = (1<<1);
|
||||||
|
|
||||||
|
// Disable interrupts.
|
||||||
|
asm volatile("cli");
|
||||||
|
|
||||||
|
// Clear all keyboard buffers (output and command buffers).
|
||||||
|
uint8_t byte;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
byte = InPortB(KEYBOARD_INTERFACE);
|
||||||
|
if ( ( byte & KEYBOARD_DATA ) != 0 ) { InPortB(KEYBOARD_IO); }
|
||||||
|
} while ( ( byte & USER_DATA ) != 0 );
|
||||||
|
|
||||||
|
// CPU reset command.
|
||||||
|
uint8_t KEYBOARD_RESET_CPU = 0xFE;
|
||||||
|
|
||||||
|
// Now pulse the CPU reset line and reset.
|
||||||
|
OutPortB(KEYBOARD_INTERFACE, KEYBOARD_RESET_CPU);
|
||||||
|
|
||||||
|
// If that didn't work, just halt.
|
||||||
|
asm volatile("hlt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,43 @@
|
||||||
|
/******************************************************************************
|
||||||
|
|
||||||
|
COPYRIGHT(C) JONAS 'SORTIE' TERMANSEN 2011.
|
||||||
|
|
||||||
|
This file is part of Sortix.
|
||||||
|
|
||||||
|
Sortix is free software: you can redistribute it and/or modify it under the
|
||||||
|
terms of the GNU General Public License as published by the Free Software
|
||||||
|
Foundation, either version 3 of the License, or (at your option) any later
|
||||||
|
version.
|
||||||
|
|
||||||
|
Sortix is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||||
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||||
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||||
|
details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with Sortix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
x86-family.h
|
||||||
|
CPU stuff for the x86 CPU family.
|
||||||
|
|
||||||
|
******************************************************************************/
|
||||||
|
|
||||||
|
#ifndef SORTIX_X86_FAMILY_H
|
||||||
|
#define SORTIX_X86_FAMILY_H
|
||||||
|
|
||||||
|
namespace Sortix
|
||||||
|
{
|
||||||
|
namespace CPU
|
||||||
|
{
|
||||||
|
void OutPortB(uint16_t Port, uint8_t Value);
|
||||||
|
void OutPortW(uint16_t Port, uint16_t Value);
|
||||||
|
void OutPortL(uint16_t Port, uint32_t Value);
|
||||||
|
uint8_t InPortB(uint16_t Port);
|
||||||
|
uint16_t InPortW(uint16_t Port);
|
||||||
|
uint32_t InPortL(uint16_t Port);
|
||||||
|
void Reboot();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -29,75 +29,5 @@ namespace Sortix
|
||||||
{
|
{
|
||||||
namespace X86
|
namespace X86
|
||||||
{
|
{
|
||||||
void OutPortB(uint16_t Port, uint8_t Value)
|
|
||||||
{
|
|
||||||
asm volatile ("outb %1, %0" : : "dN" (Port), "a" (Value));
|
|
||||||
}
|
|
||||||
|
|
||||||
void OutPortW(uint16_t Port, uint16_t Value)
|
|
||||||
{
|
|
||||||
asm volatile ("outw %1, %0" : : "dN" (Port), "a" (Value));
|
|
||||||
}
|
|
||||||
|
|
||||||
void OutPortL(uint16_t Port, uint32_t Value)
|
|
||||||
{
|
|
||||||
asm volatile ("outl %1, %0" : : "dN" (Port), "a" (Value));
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t InPortB(uint16_t Port)
|
|
||||||
{
|
|
||||||
uint8_t Result;
|
|
||||||
asm volatile("inb %1, %0" : "=a" (Result) : "dN" (Port));
|
|
||||||
return Result;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t InPortW(uint16_t Port)
|
|
||||||
{
|
|
||||||
uint16_t Result;
|
|
||||||
asm volatile("inw %1, %0" : "=a" (Result) : "dN" (Port));
|
|
||||||
return Result;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t InPortL(uint16_t Port)
|
|
||||||
{
|
|
||||||
uint32_t Result;
|
|
||||||
asm volatile("inl %1, %0" : "=a" (Result) : "dN" (Port));
|
|
||||||
return Result;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Reboot()
|
|
||||||
{
|
|
||||||
// Keyboard interface IO port: data and control.
|
|
||||||
const uint16_t KEYBOARD_INTERFACE = 0x64;
|
|
||||||
|
|
||||||
// Keyboard IO port.
|
|
||||||
const uint16_t KEYBOARD_IO = 0x60;
|
|
||||||
|
|
||||||
// Keyboard data is in buffer (output buffer is empty) (bit 0).
|
|
||||||
const uint8_t KEYBOARD_DATA = (1<<0);
|
|
||||||
|
|
||||||
// User data is in buffer (command buffer is empty) (bit 1).
|
|
||||||
const uint8_t USER_DATA = (1<<1);
|
|
||||||
|
|
||||||
// Disable interrupts.
|
|
||||||
asm volatile("cli");
|
|
||||||
|
|
||||||
// Clear all keyboard buffers (output and command buffers).
|
|
||||||
uint8_t byte;
|
|
||||||
do
|
|
||||||
{
|
|
||||||
byte = InPortB(KEYBOARD_INTERFACE);
|
|
||||||
if ( ( byte & KEYBOARD_DATA ) != 0 ) { InPortB(KEYBOARD_IO); }
|
|
||||||
} while ( ( byte & USER_DATA ) != 0 );
|
|
||||||
|
|
||||||
// CPU reset command.
|
|
||||||
uint8_t KEYBOARD_RESET_CPU = 0xFE;
|
|
||||||
|
|
||||||
// Now pulse the CPU reset line and reset.
|
|
||||||
OutPortB(KEYBOARD_INTERFACE, KEYBOARD_RESET_CPU);
|
|
||||||
|
|
||||||
// If that didn't work, just halt.
|
|
||||||
asm volatile("hlt");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
You should have received a copy of the GNU General Public License along
|
You should have received a copy of the GNU General Public License along
|
||||||
with Sortix. If not, see <http://www.gnu.org/licenses/>.
|
with Sortix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
x86
|
x86.h
|
||||||
CPU stuff for the x86 platform.
|
CPU stuff for the x86 platform.
|
||||||
|
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
@ -25,17 +25,12 @@
|
||||||
#ifndef SORTIX_X86_H
|
#ifndef SORTIX_X86_H
|
||||||
#define SORTIX_X86_H
|
#define SORTIX_X86_H
|
||||||
|
|
||||||
|
#include "../x86-family/x86-family.h"
|
||||||
|
|
||||||
namespace Sortix
|
namespace Sortix
|
||||||
{
|
{
|
||||||
namespace X86
|
namespace X86
|
||||||
{
|
{
|
||||||
void OutPortB(uint16_t Port, uint8_t Value);
|
|
||||||
void OutPortW(uint16_t Port, uint16_t Value);
|
|
||||||
void OutPortL(uint16_t Port, uint32_t Value);
|
|
||||||
uint8_t InPortB(uint16_t Port);
|
|
||||||
uint16_t InPortW(uint16_t Port);
|
|
||||||
uint32_t InPortL(uint16_t Port);
|
|
||||||
|
|
||||||
struct InterruptRegisters
|
struct InterruptRegisters
|
||||||
{
|
{
|
||||||
uint32_t cr2;
|
uint32_t cr2;
|
||||||
|
@ -44,8 +39,6 @@ namespace Sortix
|
||||||
uint32_t int_no, err_code; // Interrupt number and error code (if applicable)
|
uint32_t int_no, err_code; // Interrupt number and error code (if applicable)
|
||||||
uint32_t eip, cs, eflags, useresp, ss; // Pushed by the processor automatically.
|
uint32_t eip, cs, eflags, useresp, ss; // Pushed by the processor automatically.
|
||||||
};
|
};
|
||||||
|
|
||||||
void Reboot();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue