updates and stuff

git-svn-id: https://spexeah.com:8443/svn/Asuro@1442 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c
This commit is contained in:
kieron 2020-07-21 23:50:07 +00:00
parent 99fc00450e
commit 9820ab7756
3 changed files with 9 additions and 11 deletions

View File

@ -20,10 +20,10 @@ type
EDX : uint32; EDX : uint32;
ESI : uint32; ESI : uint32;
EDI : uint32; EDI : uint32;
DS : uint32; DS : uint16;
ES : uint32; ES : uint16;
FS : uint32; FS : uint16;
GS : uint32; GS : uint16;
end; end;
PInterruptRegisters = ^TInterruptRegisters; PInterruptRegisters = ^TInterruptRegisters;
@ -63,10 +63,10 @@ procedure correctInterruptRegisters(Errorcode : boolean);
begin begin
if IntReg <> nil then begin if IntReg <> nil then begin
If errorcode then begin If errorcode then begin
IntSpec:= PInterruptSpecialRegisters(uint32(IntReg) + uint32(SizeOf(TInterruptRegisters)) + uint32(Sizeof(TError))); IntSpec:= PInterruptSpecialRegisters(uint32(IntReg) + sizeof(TInterruptRegisters) + uint32(4));
IntErr:= PError(uint32(IntReg) + uint32(sizeof(TInterruptRegisters))); IntErr:= PError(uint32(IntReg) + sizeof(TInterruptRegisters));
end else begin end else begin
IntSpec:= PInterruptSpecialRegisters(uint32(IntReg) + uint32(SizeOf(TInterruptRegisters))); IntSpec:= PInterruptSpecialRegisters(uint32(IntReg) + sizeof(TInterruptRegisters));
IntErr:= PError(@ZeroError); IntErr:= PError(@ZeroError);
end; end;
end; end;

View File

@ -76,7 +76,8 @@ end;
procedure ISR_3; interrupt; procedure ISR_3; interrupt;
begin begin
asm asm
MOV IntReg, EBP end; MOV IntReg, EBP
end;
ISR_N(3); ISR_N(3);
end; end;

View File

@ -202,9 +202,6 @@ begin
{ Filsystems } { Filsystems }
fat32.init(); fat32.init();
i:= 0;
i:= i div i;
{ Device Drivers } { Device Drivers }
tracer.push_trace('kmain.DEVDRV'); tracer.push_trace('kmain.DEVDRV');
console.outputln('KERNEL', 'DEVICE DRIVERS: INIT BEGIN.'); console.outputln('KERNEL', 'DEVICE DRIVERS: INIT BEGIN.');