olemorud/operating-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No more double faults B-)

Browse Source
This commit is contained in:
Ole Morud
2024-08-07 13:38:21 +02:00
parent cf7a7303e3
commit 1e385af53c
16 changed files with 496 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/lib/printf.c
View File

@@ -31,12 +31,16 @@ static inline int ps_get(struct printf_state* s)
return s->str.data[s->i++];
}
static int print_long(unsigned long n, struct str alphabet, bool is_signed)
static int print_long(unsigned long n, struct str alphabet, bool is_signed, unsigned int padding, char pad_char)
{
constexpr size_t BUF_SZ = 21;
constexpr size_t BUF_SZ = 128;
char buf[BUF_SZ];
size_t i = 0;
if (padding > BUF_SZ) {
return -1;
}
if (n == 0) {
terminal_putchar('0');
return 1;
@@ -59,37 +63,60 @@ static int print_long(unsigned long n, struct str alphabet, bool is_signed)
buf[BUF_SZ-i] = alphabet.data[n % alphabet.len];
n /= alphabet.len;
}
while (i < padding) {
i += 1;
buf[BUF_SZ-i] = pad_char;
}
terminal_write((struct str){.data = &buf[BUF_SZ-i], .len = i});
return i;
}
static int print_i32(struct printf_state* s)
static int print_i32(struct printf_state* s, int padding, char pad_char)
{
padding = padding ? padding : 0;
pad_char = pad_char ? pad_char : ' ';
long n = va_arg(s->ap, int32_t);
return print_long(n, str_attach("0123456789"), true);
return print_long(n, str_attach("0123456789"), true, padding, pad_char);
}
static int print_u32(struct printf_state* s)
static int print_u32(struct printf_state* s, int padding, char pad_char)
{
padding = padding ? padding : 0;
pad_char = pad_char ? pad_char : ' ';
unsigned long n = va_arg(s->ap, uint32_t);
return print_long(n, str_attach("0123456789"), false);
return print_long(n, str_attach("0123456789"), false, padding, pad_char);
}
static int print_x32(struct printf_state* s)
static int print_x32(struct printf_state* s, int padding, char pad_char)
{
padding = padding ? padding : 0;
pad_char = pad_char ? pad_char : '0';
unsigned long n = va_arg(s->ap, uint32_t);
return print_long(n, str_attach("0123456789abcdefgh"), false);
struct str alphabet = str_attach("0123456789abcdef");
return print_long(n, alphabet, false, padding, pad_char);
}
static int print_str(struct printf_state* s)
static int print_b32(struct printf_state* s, int padding, char pad_char)
{
const struct str str = va_arg(s->ap, struct str);
for (size_t i=0; i < str.len; i++) {
terminal_putchar(str.data[i]);
}
return str.len;
padding = padding ? padding : 32;
pad_char = pad_char ? pad_char : '0';
unsigned long n = va_arg(s->ap, uint32_t);
struct str alphabet = str_attach("01");
return print_long(n, alphabet, false, padding, pad_char);
}
static int print_str(struct printf_state* s, int padding, char pad_char)
{
// TODO: implement padding
(void)padding;
(void)pad_char;
const struct str str = va_arg(s->ap, struct str);
for (size_t i=0; i < str.len; i++) {
terminal_putchar(str.data[i]);
}
return str.len;
}
#pragma GCC diagnostic ignored "-Wmultichar"
@@ -97,6 +124,8 @@ static int parse_format_cmd(struct printf_state* s)
{
int c;
uint32_t cmd = 0;
int pad = 0;
char pad_char = '\0';
constexpr uint32_t CHAR_MASK = (1<<CHAR_BIT)-1;
@@ -109,21 +138,21 @@ static int parse_format_cmd(struct printf_state* s)
return -1;
switch (cmd) {
// 16 bit types are promoted to 32 bit by va_arg(...) anyways
// 16 bit types are promoted to 32 bit by va_arg(...) anyways
case 'i16':
case 'i32':
return print_i32(s);
return print_i32(s, pad, pad_char);
case 'u16':
case 'u32':
return print_u32(s);
return print_u32(s, pad, pad_char);
case 'x16':
case 'x32':
return print_x32(s);
return print_x32(s, pad, pad_char);
case 'str':
return print_str(s);
case 'str':
return print_str(s, pad, pad_char);
default:
return -1;