corey/rosos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move C library to separate module

Browse Source
This commit is contained in:
corey 2023-11-25 20:29:49 -06:00
parent 3f162e2cfa
commit 7f5ad11115
6 changed files with 80 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*.o
kernel

24
Makefile
View File

@ -1,26 +1,24 @@
CFLAGS= -m32 -Wfatal-errors -nostdlib -Wno-builtin-declaration-mismatch
ASFLAGS= --32
LDFLAGS= -melf_i386 -nostdlib -e loader -T link.ld
OBJS=kernel.bin
OBJS=loader.o kernel.o c.o
all: $(OBJS)
all: kernel
kernel.bin: loader.o kernel.o
@echo " LD kernel.bin"
@$(LD) $(LDFLAGS) $^ -o $@
run: kernel
qemu-system-i386 -enable-kvm -m 4g -kernel $^
kernel: $(OBJS)
$(LD) $(LDFLAGS) $^ -o $@
install: $(OBJS)
@echo " CP kernel.bin"
@cp ./kernel.bin /boot/mykernel.bin
cp ./kernel /boot/mykernel
%.o: %.c
@echo " CC $@"
@$(CC) $(CFLAGS) -c $^
$(CC) $(CFLAGS) -c $^
%.o: %.s
@echo " AS $@"
@$(AS) $(ASFLAGS) -c $^ -o $@
$(AS) $(ASFLAGS) -c $^ -o $@
clean:
@echo " RM *.o kernel.bin"
@$(RM) *.o kernel.bin
$(RM) $(OBJS) kernel

40
c.c Normal file
View File

@ -0,0 +1,40 @@
#include"c.h"
FILE*stdout=&(FILE){.fd=0,.offset=(unsigned short*)0xb8000,.seek=0};
void fputc(char c,FILE*f)
{
if(c=='\n')
f->seek=(f->seek+WIDTH)/WIDTH*WIDTH;
else
f->offset[f->seek++]=0x1f00|c;
}
// puts to FILE
void fputs(FILE*f,char*s)
{
for(unsigned i=0;s[i];++i)
//*f->offset++=0x1f00|s[i];
fputc(s[i],f);
fputc('\n',f);
}
// print integer
void printif(FILE*f,int d)
{
char b[32];
int i=0;
// Get each digit as character
while(d>0)
{
int m=d%10;
d/=10;
b[i++]=m+'0';
}
b[i]=0;
// Print reversed string
for(i;i>=0;--i)
fputc(b[i],f);
}

26
c.h Normal file
View File

@ -0,0 +1,26 @@
/****
* Tiny standard C library
* subset implementation
****/
#pragma once
#define SPACE " "
#define WIDTH 80
// FILE type
typedef struct FILE
{
unsigned fd;
unsigned short*offset;
unsigned int seek;
} FILE;
extern FILE*stdout;
void fputc(char c,FILE*f);
void fputs(FILE*f,char*s);
void printif(FILE*f,int d);
#define puts(x) fputs(stdout,x)
#define printi(x) printif(stdout,x)

56
kernel.c
View File

@ -1,58 +1,4 @@
#define SPACE " "
#define WIDTH 80
// FILE type
typedef struct FILE
{
unsigned fd;
unsigned short*offset;
unsigned int seek;
} FILE;
FILE*stdout=&(FILE){.fd=0,.offset=(unsigned short*)0xb8000,.seek=0};
void fputc(char c,FILE*f)
{
if(c=='\n')
f->seek=(f->seek+WIDTH)/WIDTH*WIDTH;
else
f->offset[f->seek++]=0x1f00|c;
}
// puts to FILE
void fputs(FILE*f,char*s)
{
for(unsigned i=0;s[i];++i)
//*f->offset++=0x1f00|s[i];
fputc(s[i],f);
fputc('\n',f);
}
#define puts(x) fputs(stdout,x)
// print integer
void printif(FILE*f,int d)
{
char b[32];
int i=0;
// Get each digit as character
while(d>0)
{
int m=d%10;
d/=10;
b[i++]=m+'0';
}
b[i]=0;
// Print reversed string
for(i;i>=0;--i)
fputc(b[i],f);
}
#define printi(x) printif(stdout,x)
#include"c.h"
// Entry point
void kernelmain(void*multiboot_structure,unsigned magicnumber)

3
loader.s
View File

@ -2,13 +2,11 @@
.set FLAGS, (1<<0 | 1<<1)
.set CHECKSUM, -(MAGIC + FLAGS)
.section .multiboot
.long MAGIC
.long FLAGS
.long CHECKSUM
.section .text
.extern kernelmain
.global loader
@ -23,7 +21,6 @@ loader:
hlt
jmp .L1
.section bss
.space 2*1024*1024 ; # 2 MiB
kernel_stack: