os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Stuff

This commit is contained in:
Julian Barathieu 2018-12-28 18:52:55 +01:00
parent 974bbba221
commit 6675f7eb78
6 changed files with 119 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Makefile
View File

@ -10,12 +10,13 @@
CCNAME="/opt/cross-cc/bin/x86_64-elf-gcc"
CC2NAME=gcc # compiler for testing
CLDSCR=-T kernel.ld
COPTIM=-O2 #-fbuiltin-memset
CWARNS=-pedantic -Wall -Wextra -Werror
CFLAGS=-nostdlib -ffreestanding -mcmodel=large -mno-red-zone -mno-mmx -mno-sse -mno-sse2
CINCLUDES=-I./kaleid
CDEFINES=
CC=$(CCNAME) $(CWARNS) $(CFLAGS) $(CDEFINES) $(CINCLUDES)
CC=$(CCNAME) $(COPTIM) $(CWARNS) $(CFLAGS) $(CDEFINES) $(CINCLUDES)
KCC=$(CC) -D_KALEID_KERNEL
ASM=nasm
@ -58,20 +59,24 @@ testing: bootloader pseudo_kern
COBJDIR=$(OBJDIR)/$(COMMDIR)
LOBJDIR=$(OBJDIR)/$(LINXDIR)
COMMDEPS=$(COMMDIR)/common.h $(COMMDIR)/assert.h $(COMMDIR)/atomic.h $(COMMDIR)/config.h \
COMMDEPS=$(COMMDIR)/common.h $(COMMDIR)/assert.h $(COMMDIR)/atomic.h $(KERNDIR)/config.h \
$(COMMDIR)/status.h
COMMOBJS=$(COBJDIR)/lib/string.o $(COBJDIR)/lib/status.o
COMMOBJS=$(COBJDIR)/lib/string.o $(COBJDIR)/lib/status.o $(COBJDIR)/lib/convert.o $(COBJDIR)/lib/memory.o
common: $(COMMDEPS) $(COMMDIR)/lib/string.c $(COMMDIR)/lib/status.c
$(KCC) -c $(COMMDIR)/lib/string.c -o $(COBJDIR)/lib/string.o
$(KCC) -c $(COMMDIR)/lib/status.c -o $(COBJDIR)/lib/status.o
$(KCC) -c $(COMMDIR)/lib/memory.c -o $(COBJDIR)/lib/memory.o
$(KCC) -c $(COMMDIR)/lib/convert.c -o $(COBJDIR)/lib/convert.o
CCC=$(CC2NAME) $(CWARNS) $(CDEFINES) $(CINCLUDES)
CCC=$(CC2NAME) $(COPTIM) $(CWARNS) $(CDEFINES) $(CINCLUDES)
common-test:
$(CCC) -c $(COMMDIR)/lib/string.c -o $(COBJDIR)/lib/string.o
$(CCC) -c $(COMMDIR)/lib/status.c -o $(COBJDIR)/lib/status.o
$(CCC) -c $(COMMDIR)/lib/memory.c -o $(COBJDIR)/lib/memory.o
$(CCC) -c $(COMMDIR)/lib/convert.c -o $(COBJDIR)/lib/convert.o
$(CCC) -c $(LINXDIR)/test-common.c -o $(LOBJDIR)/test-common.o
$(CCC) $(COMMOBJS) $(LOBJDIR)/test-common.o -o $(BINDIR)/kaleid-common.elf

2
src/kaleid/common/lib/convert.c
View File

@ -7,7 +7,7 @@
// Desc: Conversion utilities //
//----------------------------------------------------------------------------//
#include "common/convert.h"
#include "common/string.h"
//
// Digits table for bases <=36

68
src/kaleid/common/lib/memory.c
View File

@ -9,3 +9,71 @@
#include "common/memory.h"
// to be moved
#define QWORD_SIZE 8
#define QWORD_ALIGN 8
//
// Set "qwords"-many aligned qwords starting from ptr to val
//
static inline void *memsetq(void *ptr, ullong uval, size_t qwords)
{
size_t n;
ullong *uptr = (ullong *)ptr;
// aligned memory write
for (n = 0; n < qwords; n++) {
*(uptr + n) = uval;
}
return ptr;
}
//
// Set "bytes"-many bytes starting from ptr to val
// This is most certainely overkill, but I enjoyed doing this
// Alignment stuff barely matters on modern processors
// This may actually be slower than the naive way
//
void *memset(void *ptr, int val, size_t bytes)
{
uchar *uptr = (uchar *)ptr;
const size_t qwords = bytes/QWORD_SIZE;
// get rid of everything after the first byte
val = val & 0xFF;
// deal with bytes before start of the first aligned qword
while (((ullong)uptr % QWORD_ALIGN) > 0 && bytes--) {
*uptr++ = (uchar)val;
}
// move qword by qword
if (qwords) {
const ullong uval = ((ullong)val << 56) | ((ullong)val << 48)
| ((ullong)val << 40) | ((ullong)val << 32)
| ((ullong)val << 24) | ((ullong)val << 16)
| ((ullong)val << 8) | ((ullong)val);
memsetq(uptr, uval, qwords);
uptr += qwords * QWORD_SIZE;
bytes %= QWORD_SIZE;
}
// deal with what's left
while (bytes--) {
*uptr++ = (uchar)val;
}
return ptr;
}
//
// Set "bytes"-many bytes starting from ptr to 0
//
void *memzero(void *ptr, size_t bytes)
{
return memset(ptr, 0, bytes);
}

10
src/kaleid/common/memory.h
View File

@ -14,5 +14,15 @@
# include "common/common.h"
#endif
#ifndef _OSK_SOURCE
# define memcpy _osk_memcpy
# define memset _osk_memset
# define memcmp _osk_memcmp
# define memzero _osk_memzero
#endif
void *memset(void *, int, size_t);
void *memzero(void *, size_t);
#endif

9
src/kaleid/common/types.h
View File

@ -15,8 +15,6 @@
# error "don't include common/types.h without common/common.h"
#endif
#ifndef KEEP_KALCOMM_TYPES_MINIMAL
typedef _Bool bool;
typedef unsigned char uchar;
typedef unsigned short ushort;
typedef unsigned int uint;
@ -24,6 +22,11 @@ typedef unsigned long ulong;
typedef long long llong;
typedef unsigned long long ullong;
typedef long double ldouble;
typedef short port_t;
typedef short status_t;
#ifndef KEEP_KALCOMM_TYPES_MINIMAL
typedef _Bool bool;
typedef uint wchar_t;
typedef ullong size_t;
typedef llong ssize_t;
@ -33,8 +36,6 @@ typedef ulong pid_t;
typedef void *va_list;
#endif
typedef short port_t;
typedef short status_t;
// XXX limits
#endif

36
src/kaleid/linux/test-common.c
View File

@ -9,34 +9,44 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define KEEP_KALCOMM_TYPES_MINIMAL
#include "common/common.h"
#include "common/string.h"
#include "common/memory.h"
int main(int argc, char *argv[])
{
(void)argc;
(void)argv;
assert(sizeof(char) == 1);
assert(sizeof(short) == 2);
assert(sizeof(int) == 4);
assert(sizeof(long) == 8);
assert(sizeof(long long) == 8);
// please don't mind how weird this file is
// I remove tests of "simple" functions after
// I'm done with testing that function
// so a lot of test variables remain in case
// I need them for a future test
const char *test1 = "test string\n";
char *test2 = malloc(strlen(test1));
char *test3 = malloc(strlen(test1));
const size_t size1 = strlen(test1);
char *test2 = malloc(size1);
char *test3 = malloc(size1);
printf("1\n");
memset(test2, 'x', size1);
#undef strlen
assert(strlen("test string") == _osk_strlen("test string"));
size_t it;
for (it = 0; it < size1; it++) {
char c = *(test2 + it);
printf("%c", (c ? c : '-'));
}
#undef strcpy
assert(strcmp(strcpy(test2, test1), _osk_strcpy(test3, test1)) == 0);
// XXX test itoa() and v?sn?printf()
// tests done
printf("2\n");
puts("");
free(test2);
free(test3);