forked from PoliEcho-holding-org/kern
IMPLEMENTED printf()!!!!!!!
It's kinda bad :/
This commit is contained in:
+53
-4
@@ -7,6 +7,14 @@
|
||||
// TODO: Make a proper file descriptor table
|
||||
#define STDOUT 1
|
||||
|
||||
/* --- Output --- */
|
||||
void putc(char c) {
|
||||
// write(STDOUT, &c, 1); TODO: This doesn't work and we need to use a static variable
|
||||
static char _c;
|
||||
_c = c;
|
||||
write(STDOUT, &_c, 1);
|
||||
}
|
||||
|
||||
void print(const char* s) {
|
||||
write(STDOUT, s, strlen(s));
|
||||
}
|
||||
@@ -15,12 +23,53 @@ void clear() {
|
||||
print("\x1b[J");
|
||||
}
|
||||
|
||||
void putc(char c) {
|
||||
static char _c; // We need to pass in a static address. Idk why
|
||||
_c = c;
|
||||
write(STDOUT, &_c, 1);
|
||||
// TODO: Dynamically allocate memory and print once instead of calling putc for every character :/
|
||||
// TODO: Support negative numbers
|
||||
// TODO: Printing individual characters doesn't let escape sequences work :(
|
||||
int printf(const char* fmt, ...) {
|
||||
char* argPtr = (char*)&fmt + sizeof(char*); // First arg after fmt
|
||||
uint8_t state = 0;
|
||||
|
||||
for (uint32_t i = 0; fmt[i] != '\0'; i++) {
|
||||
char c = fmt[i];
|
||||
|
||||
if (state == 0) {
|
||||
if (c == '%') state = '%';
|
||||
else putc(c);
|
||||
} else if (state == '%') {
|
||||
switch (c) {
|
||||
case 'd': // Decimal number
|
||||
print(itoa(*(uint32_t*)argPtr, 10));
|
||||
argPtr += sizeof(unsigned int);
|
||||
break;
|
||||
case 'x': // Hex number
|
||||
print(itoa(*(uint32_t*)argPtr, 16));
|
||||
argPtr += sizeof(unsigned int);
|
||||
break;
|
||||
case 's': // String
|
||||
print(*(char**)argPtr);
|
||||
argPtr += sizeof(char*);
|
||||
break;
|
||||
case 'c': // Char
|
||||
putc(*(char*)argPtr);
|
||||
argPtr += sizeof(char);
|
||||
break;
|
||||
case '%': // Just print '%'
|
||||
putc('%');
|
||||
break;
|
||||
default:
|
||||
putc('%');
|
||||
putc(c);
|
||||
break;
|
||||
}
|
||||
state = 0;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* --- Input --- */
|
||||
char getc() {
|
||||
char* character = (char*)0x2100;
|
||||
*character = '\0';
|
||||
|
||||
+4
-7
@@ -6,19 +6,16 @@
|
||||
// Source: http://www.strudel.org.uk/itoa/
|
||||
char* itoa(uint32_t val, uint8_t base) {
|
||||
static char buf[32] = { 0 };
|
||||
|
||||
if (base == 0 || base > 16) {
|
||||
// TODO: Add errors!!
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (base == 0 || base > 16) { return NULL; }
|
||||
|
||||
if (val == 0) {
|
||||
buf[0] = '0';
|
||||
return buf;
|
||||
}
|
||||
|
||||
int i = 30;
|
||||
for (; val && i; i--, val /= base) {
|
||||
int i;
|
||||
for (i = 30; val && i; i--, val /= base) {
|
||||
buf[i] = "0123456789abcdef"[val % base];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user