xamidev/blankos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Add: working puts implementation

Browse Source
This commit is contained in:
xamidev
2024-05-19 15:00:55 +02:00
parent 5cd61cf95c
commit 8d33440ced
7 changed files with 128 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
bochslog.txt
View File

@@ -44,45 +44,45 @@
00000000000i[USBCTL] Pluggable USB devices 00000000000i[USBCTL] Pluggable USB devices
00000000000i[USBCTL] mouse tablet keypad keyboard floppy disk cdrom printer 00000000000i[USBCTL] mouse tablet keypad keyboard floppy disk cdrom printer
00000000000i[USBCTL] hub 00000000000i[USBCTL] hub
00000000000i[MEM0 ] allocated memory at 0x7fb5595dc010. after alignment, vector=0x7fb5595dd000 00000000000i[MEM0 ] allocated memory at 0x7f6755ddd010. after alignment, vector=0x7f6755dde000
00000000000i[MEM0 ] 32.00MB 00000000000i[MEM0 ] 32.00MB
00000000000i[MEM0 ] mem block size = 0x00020000, blocks=256 00000000000i[MEM0 ] mem block size = 0x00020000, blocks=256
00000000000i[MEM0 ] rom at 0xffff0000/65536 ('/usr/share/bochs/BIOS-bochs-legacy') 00000000000i[MEM0 ] rom at 0xffff0000/65536 ('/usr/share/bochs/BIOS-bochs-legacy')
00000000000i[CPU0 ] WARNING: 3DNow! is not implemented yet ! 00000000000i[CPU0 ] WARNING: 3DNow! is not implemented yet !
00000000000i[DEV ] will paste characters every 100 iodev timer ticks 00000000000i[DEV ] will paste characters every 100 iodev timer ticks
00000000000i[ ] lt_dlhandle is 0x55fee5417090 00000000000i[ ] lt_dlhandle is 0x55b16dc75c30
00000000000i[PLUGIN] loaded plugin libbx_soundalsa.so 00000000000i[PLUGIN] loaded plugin libbx_soundalsa.so
00000000000i[WAVOUT] ALSA: opened default PCM output device 00000000000i[WAVOUT] ALSA: opened default PCM output device
00000000000i[WAVOUT] changed sample rate to 44101 00000000000i[WAVOUT] changed sample rate to 44101
00000000000i[ ] lt_dlhandle is 0x55fee5bcce70 00000000000i[ ] lt_dlhandle is 0x55b16e42bb40
00000000000i[PLUGIN] loaded plugin libbx_pci.so 00000000000i[PLUGIN] loaded plugin libbx_pci.so
00000000000i[ ] lt_dlhandle is 0x55fee5417170 00000000000i[ ] lt_dlhandle is 0x55b16dc75d10
00000000000i[PLUGIN] loaded plugin libbx_pci2isa.so 00000000000i[PLUGIN] loaded plugin libbx_pci2isa.so
00000000000i[ ] lt_dlhandle is 0x55fee5394f80 00000000000i[ ] lt_dlhandle is 0x55b16dbf3de0
00000000000i[PLUGIN] loaded plugin libbx_usb_uhci.so 00000000000i[PLUGIN] loaded plugin libbx_usb_uhci.so
00000000000i[ ] lt_dlhandle is 0x55fee5431120 00000000000i[ ] lt_dlhandle is 0x55b16dc90240
00000000000i[PLUGIN] loaded plugin libbx_acpi.so 00000000000i[PLUGIN] loaded plugin libbx_acpi.so
00000000000i[ ] lt_dlhandle is 0x55fee5394380 00000000000i[ ] lt_dlhandle is 0x55b16dbf31e0
00000000000i[PLUGIN] loaded plugin libbx_hpet.so 00000000000i[PLUGIN] loaded plugin libbx_hpet.so
00000000000i[ ] lt_dlhandle is 0x55fee5bd7620 00000000000i[ ] lt_dlhandle is 0x55b16e4362f0
00000000000i[PLUGIN] loaded plugin libbx_cmos.so 00000000000i[PLUGIN] loaded plugin libbx_cmos.so
00000000000i[ ] lt_dlhandle is 0x55fee5bd7e30 00000000000i[ ] lt_dlhandle is 0x55b16e436b00
00000000000i[PLUGIN] loaded plugin libbx_dma.so 00000000000i[PLUGIN] loaded plugin libbx_dma.so
00000000000i[ ] lt_dlhandle is 0x55fee5bd8640 00000000000i[ ] lt_dlhandle is 0x55b16e437470
00000000000i[PLUGIN] loaded plugin libbx_pic.so 00000000000i[PLUGIN] loaded plugin libbx_pic.so
00000000000i[ ] lt_dlhandle is 0x55fee5bd8e00 00000000000i[ ] lt_dlhandle is 0x55b16e437c30
00000000000i[PLUGIN] loaded plugin libbx_pit.so 00000000000i[PLUGIN] loaded plugin libbx_pit.so
00000000000i[ ] lt_dlhandle is 0x55fee5bd9820 00000000000i[ ] lt_dlhandle is 0x55b16e438650
00000000000i[PLUGIN] loaded plugin libbx_vga.so 00000000000i[PLUGIN] loaded plugin libbx_vga.so
00000000000i[ ] lt_dlhandle is 0x55fee5bfae60 00000000000i[ ] lt_dlhandle is 0x55b16e459c90
00000000000i[PLUGIN] loaded plugin libbx_floppy.so 00000000000i[PLUGIN] loaded plugin libbx_floppy.so
00000000000i[ ] lt_dlhandle is 0x55fee5bfb6a0 00000000000i[ ] lt_dlhandle is 0x55b16e45a4d0
00000000000i[PLUGIN] loaded plugin libbx_ioapic.so 00000000000i[PLUGIN] loaded plugin libbx_ioapic.so
00000000000i[ ] lt_dlhandle is 0x55fee5bfbeb0 00000000000i[ ] lt_dlhandle is 0x55b16e45ace0
00000000000i[PLUGIN] loaded plugin libbx_keyboard.so 00000000000i[PLUGIN] loaded plugin libbx_keyboard.so
00000000000i[ ] lt_dlhandle is 0x55fee5bfc7b0 00000000000i[ ] lt_dlhandle is 0x55b16e45b5e0
00000000000i[PLUGIN] loaded plugin libbx_harddrv.so 00000000000i[PLUGIN] loaded plugin libbx_harddrv.so
00000000000i[ ] lt_dlhandle is 0x55fee5bfe880 00000000000i[ ] lt_dlhandle is 0x55b16e45d6b0
00000000000i[PLUGIN] loaded plugin libbx_pci_ide.so 00000000000i[PLUGIN] loaded plugin libbx_pci_ide.so
00000000000i[PLUGIN] init_dev of 'pci' plugin device by virtual method 00000000000i[PLUGIN] init_dev of 'pci' plugin device by virtual method
00000000000i[DEV ] i440FX PMC present at device 0, function 0 00000000000i[DEV ] i440FX PMC present at device 0, function 0
@@ -90,7 +90,7 @@
00000000000i[DEV ] PIIX3 PCI-to-ISA bridge present at device 1, function 0 00000000000i[DEV ] PIIX3 PCI-to-ISA bridge present at device 1, function 0
00000000000i[PLUGIN] init_dev of 'cmos' plugin device by virtual method 00000000000i[PLUGIN] init_dev of 'cmos' plugin device by virtual method
00000000000i[CMOS ] Using local time for initial clock 00000000000i[CMOS ] Using local time for initial clock
00000000000i[CMOS ] Setting initial clock to: Sun May 19 14:30:46 2024 (time0=1716121846) 00000000000i[CMOS ] Setting initial clock to: Sun May 19 15:00:39 2024 (time0=1716123639)
00000000000i[PLUGIN] init_dev of 'dma' plugin device by virtual method 00000000000i[PLUGIN] init_dev of 'dma' plugin device by virtual method
00000000000i[DMA ] channel 4 used by cascade 00000000000i[DMA ] channel 4 used by cascade
00000000000i[PLUGIN] init_dev of 'pic' plugin device by virtual method 00000000000i[PLUGIN] init_dev of 'pic' plugin device by virtual method
@@ -234,42 +234,41 @@
00000000000i[PLUGIN] reset of 'usb_uhci' plugin device by virtual method 00000000000i[PLUGIN] reset of 'usb_uhci' plugin device by virtual method
00000000000i[ ] set SIGINT handler to bx_debug_ctrlc_handler 00000000000i[ ] set SIGINT handler to bx_debug_ctrlc_handler
00000004662i[BIOS ] $Revision: 14314 $ $Date: 2021-07-14 18:10:19 +0200 (Mi, 14. Jul 2021) $ 00000004662i[BIOS ] $Revision: 14314 $ $Date: 2021-07-14 18:10:19 +0200 (Mi, 14. Jul 2021) $
00000317812i[KBD ] reset-disable command received 00000317288i[KBD ] reset-disable command received
00000318931i[PIDE ] BAR #4: i/o base address = 0xc000 00000318445i[PIDE ] BAR #4: i/o base address = 0xc000
00000319158i[UHCI ] BAR #4: i/o base address = 0xc100 00000318672i[UHCI ] BAR #4: i/o base address = 0xc100
00000324993i[P2ISA ] PCI IRQ routing: PIRQD# set to 0x0b 00000324507i[P2ISA ] PCI IRQ routing: PIRQD# set to 0x0b
00000325009i[P2ISA ] write: ELCR2 = 0x08 00000324523i[P2ISA ] write: ELCR2 = 0x08
00000325029i[UHCI ] new IRQ line = 11 00000324543i[UHCI ] new IRQ line = 11
00000325094i[P2ISA ] PCI IRQ routing: PIRQA# set to 0x0a 00000324608i[P2ISA ] PCI IRQ routing: PIRQA# set to 0x0a
00000325110i[P2ISA ] write: ELCR2 = 0x0c 00000324624i[P2ISA ] write: ELCR2 = 0x0c
00000325130i[ACPI ] new IRQ line = 10 00000324644i[ACPI ] new IRQ line = 10
00000443430i[VBIOS ] VGABios $Id: vgabios.c 288 2021-05-28 19:05:28Z vruppert $ 00000442944i[VBIOS ] VGABios $Id: vgabios.c 288 2021-05-28 19:05:28Z vruppert $
00000443501i[BXVGA ] VBE known Display Interface b0c0 00000443015i[BXVGA ] VBE known Display Interface b0c0
00000443533i[BXVGA ] VBE known Display Interface b0c5 00000443047i[BXVGA ] VBE known Display Interface b0c5
00000446176i[VBIOS ] VBE Bios $Id: vbe.c 292 2021-06-03 12:24:22Z vruppert $ 00000445690i[VBIOS ] VBE Bios $Id: vbe.c 292 2021-06-03 12:24:22Z vruppert $
00004098346i[BIOS ] IDE time out 00004097883i[BIOS ] IDE time out
01047918503i[BIOS ] Booting from 07c0:0000 00847008580i[BIOS ] Booting from 07c0:0000
01048013887i[BIOS ] int13_harddisk: function 41, unmapped device for ELDL=80 00847103964i[BIOS ] int13_harddisk: function 41, unmapped device for ELDL=80
01048017558i[BIOS ] int13_harddisk: function 08, unmapped device for ELDL=80 00847107635i[BIOS ] int13_harddisk: function 08, unmapped device for ELDL=80
01048021229i[BIOS ] *** int 15h function AX=00c0, BX=0000 not yet supported! 00847111306i[BIOS ] *** int 15h function AX=00c0, BX=0000 not yet supported!
01206143903i[ ] Ctrl-C detected in signal handler. 01027874000p[SDL2 ] >>PANIC<< User requested shutdown.
01206143904i[ ] dbg: Quit 01027874000i[CPU0 ] CPU is in protected mode (active)
01206143904i[CPU0 ] CPU is in protected mode (active) 01027874000i[CPU0 ] CS.mode = 32 bit
01206143904i[CPU0 ] CS.mode = 32 bit 01027874000i[CPU0 ] SS.mode = 32 bit
01206143904i[CPU0 ] SS.mode = 32 bit 01027874000i[CPU0 ] EFER = 0x00000000
01206143904i[CPU0 ] EFER = 0x00000000 01027874000i[CPU0 ] | EAX=0000002a EBX=0002cd80 ECX=000000f0 EDX=000003d5
01206143904i[CPU0 ] | EAX=0000002a EBX=0002cd80 ECX=00000008 EDX=001001a3 01027874000i[CPU0 ] | ESP=00067ecc EBP=00067ee0 ESI=0002ced8 EDI=0002ced9
01206143904i[CPU0 ] | ESP=00067ecc EBP=00067ee0 ESI=0002ced8 EDI=0002ced9 01027874000i[CPU0 ] | IOPL=0 id vip vif ac vm rf nt of df if tf sf zf af pf cf
01206143904i[CPU0 ] | IOPL=0 id vip vif ac vm rf nt of df if tf sf zf af pf cf 01027874000i[CPU0 ] | SEG sltr(index|ti|rpl) base limit G D
01206143904i[CPU0 ] | SEG sltr(index|ti|rpl) base limit G D 01027874000i[CPU0 ] | CS:0008( 0001| 0| 0) 00000000 ffffffff 1 1
01206143904i[CPU0 ] | CS:0008( 0001| 0| 0) 00000000 ffffffff 1 1 01027874000i[CPU0 ] | DS:0010( 0002| 0| 0) 00000000 ffffffff 1 1
01206143904i[CPU0 ] | DS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 01027874000i[CPU0 ] | SS:0010( 0002| 0| 0) 00000000 ffffffff 1 1
01206143904i[CPU0 ] | SS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 01027874000i[CPU0 ] | ES:0010( 0002| 0| 0) 00000000 ffffffff 1 1
01206143904i[CPU0 ] | ES:0010( 0002| 0| 0) 00000000 ffffffff 1 1 01027874000i[CPU0 ] | FS:0010( 0002| 0| 0) 00000000 ffffffff 1 1
01206143904i[CPU0 ] | FS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 01027874000i[CPU0 ] | GS:0010( 0002| 0| 0) 00000000 ffffffff 1 1
01206143904i[CPU0 ] | GS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 01027874000i[CPU0 ] | EIP=0010033b (0010033b)
01206143904i[CPU0 ] | EIP=001001bf (001001bf) 01027874000i[CPU0 ] | CR0=0x60000011 CR2=0x00000000
01206143904i[CPU0 ] | CR0=0x60000011 CR2=0x00000000 01027874000i[CPU0 ] | CR3=0x00000000 CR4=0x00000000
01206143904i[CPU0 ] | CR3=0x00000000 CR4=0x00000000 01027874000i[CMOS ] Last time is 1716124666 (Sun May 19 15:17:46 2024)
01206143904i[CMOS ] Last time is 1716123052 (Sun May 19 14:50:52 2024) 01027874000i[SIM ] quit_sim called with exit code 1
01206143904i[SIM ] quit_sim called with exit code 0

BIN
iso/boot/kernel.elf
View File

Binary file not shown.

BIN
kernel.elf
View File

Binary file not shown.

3
kmain.c
View File

@@ -2,6 +2,7 @@
int kmain(int retvalue) int kmain(int retvalue)
{ {
write("hello"); clear();
puts("hello\nbrave\nnew\nworld");
return retvalue; return retvalue;
} }

BIN
os.iso
View File

Binary file not shown.

72
stdio.c
View File

@@ -3,25 +3,83 @@
#include "string.h" #include "string.h"
char* fb = (char *) 0x000B8000; char* fb = (char *) 0x000B8000;
const unsigned VGA_WIDTH = 80;
const unsigned VGA_HEIGHT = 25;
const unsigned int COLOR = 0x7;
unsigned int VGA_X = 0, VGA_Y = 0;
void move_cursor(unsigned short pos) void move_cursor(int x, int y)
{ {
unsigned short pos = y*VGA_WIDTH+x;
outb(FB_CMD_PORT, FB_HIGH_BYTE_CMD); outb(FB_CMD_PORT, FB_HIGH_BYTE_CMD);
outb(FB_DATA_PORT, ((pos >> 8) & 0x00FF)); outb(FB_DATA_PORT, ((pos >> 8) & 0x00FF));
outb(FB_CMD_PORT, FB_LOW_BYTE_CMD); outb(FB_CMD_PORT, FB_LOW_BYTE_CMD);
outb(FB_DATA_PORT, pos & 0x00FF); outb(FB_DATA_PORT, pos & 0x00FF);
} }
void putchar(unsigned int i, char c, unsigned char fg, unsigned char bg) void putchar(int x, int y, char c)
{ {
fb[i] = c; fb[2*(y*VGA_WIDTH+x)] = c;
fb [i+1] = ((fg & 0x0F) << 4 | (bg & 0x0F));
} }
void write(char *buf) void putcolor(int x, int y, int color)
{ {
for (int i=0; i<strlen(buf); i++) fb[2*(y*VGA_WIDTH+x)+1] = color;
}
void clear(void)
{
for (unsigned int y=0; y<VGA_HEIGHT; y++)
{ {
putchar(2*i, buf[i], FB_GREEN, FB_DARK_GREY); for (unsigned int x=0; x<VGA_WIDTH; x++)
{
putchar(x, y, '\0');
putcolor(x, y, COLOR);
}
}
VGA_X = 0;
VGA_Y = 0;
move_cursor(VGA_X, VGA_Y);
}
void putc(char c)
{
switch(c)
{
case '\n':
VGA_X = 0;
VGA_Y++;
break;
case '\r':
VGA_X = 0;
break;
default:
putchar(VGA_X, VGA_Y, c);
VGA_X++;
break;
}
if (VGA_X >= VGA_WIDTH)
{
VGA_Y++;
VGA_X = 0;
}
//if (VGA_Y >= VGA_HEIGHT) scroll
move_cursor(VGA_X, VGA_Y);
}
void puts(const char* str)
{
while (*str)
{
putc(*str);
str++;
} }
} }

8
stdio.h
View File

@@ -9,8 +9,10 @@
#define FB_HIGH_BYTE_CMD 14 #define FB_HIGH_BYTE_CMD 14
#define FB_LOW_BYTE_CMD 15 #define FB_LOW_BYTE_CMD 15
void move_cursor(unsigned short pos); void move_cursor(int x, int y);
void putchar(unsigned int i, char c, unsigned char fg, unsigned char bg); void putchar(int x, int y, char c);
void write(char *buf); void puts(const char* str);
void clear(void);
void putcolor(int x, int y, int color);
#endif #endif