diff options
Diffstat (limited to 'userspace/xterm')
| -rw-r--r-- | userspace/xterm/Makefile | 6 | ||||
| -rw-r--r-- | userspace/xterm/crt0.s | 39 | ||||
| -rw-r--r-- | userspace/xterm/vesa.c | 2 |
3 files changed, 1 insertions, 46 deletions
diff --git a/userspace/xterm/Makefile b/userspace/xterm/Makefile index 3056094..b6bac6e 100644 --- a/userspace/xterm/Makefile +++ b/userspace/xterm/Makefile @@ -1,12 +1,6 @@ CC=i686-foolos-gcc AS=i686-foolos-as -CFLAGS=-I/home/miguel/temp/foolos/usr/i686-foolos/include - -LDFLAGS=-L/home/miguel/temp/foolos/usr/i686-foolos/lib/ - -all: crt0.o xterm - xterm: vesa.o terminal.o clean: diff --git a/userspace/xterm/crt0.s b/userspace/xterm/crt0.s deleted file mode 100644 index dedc86c..0000000 --- a/userspace/xterm/crt0.s +++ /dev/null @@ -1,39 +0,0 @@ -.global _start - -_start: - -# copy reent to this page -push %ebx -push %ecx - -mov _impure_ptr,%eax -mov $0xf5000000,%ebx -copy: -mov (%eax),%ecx -mov %ecx,(%ebx) -add $4, %ebx -add $4, %eax -cmp $0xf5001000,%ebx -jne copy - -pop %ecx -pop %ebx - -movl $0xf5000000, _impure_ptr - -# environment adress was passed on stack - -pop %eax -mov %eax, environ - -# call main (argc and argv are on the stack) -call main - -# push exit code and pass to _exit syscall -push %eax -call exit - -# this should never be reached! -.wait: - hlt -jmp .wait diff --git a/userspace/xterm/vesa.c b/userspace/xterm/vesa.c index e795cc8..085d1b0 100644 --- a/userspace/xterm/vesa.c +++ b/userspace/xterm/vesa.c @@ -4,7 +4,7 @@ #include "../newcalls.h" #include "vesa.h" -#define VMEM_USER_FRAMEBUFFER 0xfa000000 +#define VMEM_USER_FRAMEBUFFER 0xfc000000 typedef struct foolfont_struct { |