os-k-team
/
kvisc
mirror of https://gitlab.os-k.eu/os-k-team/kvisc.git
1
0
Fork 0
Code Releases Activity

vm

This commit is contained in:
julianb0 2019-07-22 14:41:50 +02:00
parent ce8411be8e
commit 9eee4817cd
No known key found for this signature in database
GPG Key ID: DDF8325C95299A62
18 changed files with 143 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
as/k-as.py
View File

@ -374,17 +374,29 @@ pconds = {
'z': 0b00011, 'z': 0b00011,
'e': 0b00011, 'e': 0b00011,
's': 0b00100, 's': 0b00100,
'p': 0b00101,
'a': 0b00110, 'pe': 0b00101,
'ae': 0b00111, 'po': 0b10101,
'b': 0b01000,
'be': 0b01001, 'b': 0b00001,
'g': 0b01010, 'be': 0b00110,
'ge': 0b01011, 'l': 0b00111,
'l': 0b01100, 'le': 0b01000,
'le': 0b01101,
'cxz': 0b01110, 'a': 0b10110, # nbe
'cxnz': 0b11110, 'ae': 0b10001, # nb
'g': 0b11000, # nle
'ge': 0b10111, # nl
'axz': 0b01001,
'bxz': 0b01010,
'cxz': 0b01011,
'dxz': 0b01100,
'axnz': 0b11001,
'bxnz': 0b11010,
'cxnz': 0b11011,
'dxnz': 0b11100,
} }
def get_cond_mask(cond, line): def get_cond_mask(cond, line):

4
ka/crt/crt.k
View File

@ -9,6 +9,10 @@ include "crt/limits.k"
include "crt/err/errno.k" include "crt/err/errno.k"
include "crt/fmt/format.k" include "crt/fmt/format.k"
include "crt/str/string.k" include "crt/str/string.k"
include "crt/mem/memory.k"
include "crt/lib/time.k" include "crt/lib/time.k"
include "crt/lib/arith128.k" include "crt/lib/arith128.k"
abort:
crash

3
ka/crt/fmt/doprnt.k
View File

@ -178,8 +178,7 @@ doprnt:
call r17 call r17
; did putc fail? ; did putc fail?
cmp rax, zero mov.axnz r15, zero ; yes, so artificially set n=0
mov.nz r15, zero ; yes, so artificially set n=0
ret ret

9
ka/crt/fmt/ltostr.k
View File

@ -20,7 +20,6 @@ utoa:
; ;
ltostr: ltostr:
mov rax, ax0 mov rax, ax0
mov rcx, zero
; make sure base is in [2, 32] ; make sure base is in [2, 32]
b.b ax2, 2, .bad b.b ax2, 2, .bad
@ -35,8 +34,7 @@ ltostr:
b.nz ax2, 10, .conv ; base 10 b.nz ax2, 10, .conv ; base 10
shr rcx, ax1, 63 ; extract ax1 sign shr rcx, ax1, 63 ; extract ax1 sign
cmp rcx, zero ; negative? sub.cxnz ax1, zero, ax1 ; NEG if negative
sub.nz ax1, zero, ax1 ; yes
; main loop ; main loop
.conv: .conv:
@ -61,9 +59,8 @@ ltostr:
; add minus flag, null-terminate and reverse ; add minus flag, null-terminate and reverse
.fini: .fini:
cmp rcx, -1 mov.cxnz b[ax0], '-'
mov.z b[ax0], '-' add.cxnz ax0, ax0, 1
add.z ax0, ax0, 1
mov b[ax0], zero mov b[ax0], zero

2
ka/crt/fmt/strtol.k
View File

@ -68,7 +68,7 @@ strtoq:
movzx rcx, b[rdx] movzx rcx, b[rdx]
; "0x"/"0b" prefix ; "0x"/"0b" prefix
b.z rcx, zero, .done ; "0" jmp.cxz .done ; "0"
b.z rcx, 'x', .parsed_0x b.z rcx, 'x', .parsed_0x
b.z rcx, 'b', .parsed_0b b.z rcx, 'b', .parsed_0b

4
ka/crt/lib/arith128.k
View File

@ -42,7 +42,7 @@ sub_lq_lq:
ret ret
; ;
; int:int mul_lq_q(int x, int y) ; int:int mul_q_q(int x, int y)
; ;
mul_q_q: mul_q_q:
mov rax, ax0 mov rax, ax0
@ -50,7 +50,7 @@ mul_q_q:
ret ret
; ;
; int:int imul_lq_q(int x, int y) ; int:int imul_q_q(int x, int y)
; ;
imul_q_q: imul_q_q:
mov rax, ax0 mov rax, ax0

6
ka/crt/lib/time.k
View File

@ -25,15 +25,15 @@ DaysInYear:
; divisible by 4? ; divisible by 4?
rem rcx, ax0, 4 rem rcx, ax0, 4
b.nz rcx, zero, .end jmp.cxnz .end
; divisible by 100? ; divisible by 100?
rem rcx, ax0, 100 rem rcx, ax0, 100
b.nz rcx, zero, .leap jmp.cxnz .leap
; divisible by 400? ; divisible by 400?
rem rcx, ax0, 400 rem rcx, ax0, 400
b.nz rcx, zero, .end jmp.cxnz .end
.leap: .leap:
add rax, rax, 1 add rax, rax, 1

20
ka/crt/mem/memcpy.k Normal file
View File

@ -0,0 +1,20 @@
; The OS/K Team licenses this file to you under the MIT license.
; See the LICENSE file in the project root for more information.
;
; void memcpy(void *, const void *, int)
;
memcpy:
mov rcx, ax2
ret.cxz
.l:
sub rdx, ax2, rcx
mov rax, b[ax1+rdx]
mov b[ax0+rdx], rax
loop .l
ret

5
ka/crt/mem/memory.k Normal file
View File

@ -0,0 +1,5 @@
; The OS/K Team licenses this file to you under the MIT license.
; See the LICENSE file in the project root for more information.
include "crt/mem/memcpy.k"

27
ka/crt/str/strcmp.k
View File

@ -10,27 +10,22 @@
; <0 if the first character that does not match has a lower value in str1 than in str2 ; <0 if the first character that does not match has a lower value in str1 than in str2
; ;
strcmp: strcmp:
mov rcx, STRLEN_MAX .l:
.1:
jmp.cxz .2
movzx rax, b[ax0] movzx rax, b[ax0]
movzx rdx, b[ax1] movzx rdx, b[ax1]
cmp rax, rdx cmp rax, rdx
jmp.nz .2 jmp.nz .r
; both zero? ; both zero?
add rbx, rax, rdx add rbx, rax, rdx
b.z rbx, zero, .2 jmp.bxz .r
add ax0, ax0, 1 add ax0, ax0, 1
add ax1, ax1, 1 add ax1, ax1, 1
sub rcx, rcx, 1 jmp .l
jmp .1
.2: .r:
sub rax, rax, rdx sub rax, rax, rdx
ret ret
@ -39,22 +34,20 @@ strcmp:
; ;
strncmp: strncmp:
mov rcx, ax2 mov rcx, ax2
jmp.cxz .r
.1: .l:
jmp.cxz .2
mov rax, b[ax0] mov rax, b[ax0]
mov rdx, b[ax1] mov rdx, b[ax1]
cmp rax, rdx cmp rax, rdx
jmp.nz .2 jmp.nz .r
add ax0, ax0, 1 add ax0, ax0, 1
add ax1, ax1, 1 add ax1, ax1, 1
sub rcx, rcx, 1 loop .l
jmp .1
.2: .r:
sub rax, rax, rdx sub rax, rax, rdx
ret ret

33
ka/crt/str/strcpy.k
View File

@ -5,60 +5,55 @@
; void strcpy(char *, const char *) ; void strcpy(char *, const char *)
; ;
strcpy: strcpy:
mov rax, b[ax1] .l:
mov b[ax0], rax mov rcx, b[ax1]
mov b[ax0], rcx
b.z rax, zero, .1 ret.cxz
add ax0, ax0, 1 add ax0, ax0, 1
add ax1, ax1, 1 add ax1, ax1, 1
jmp strcpy jmp .l
.1:
ret
; ;
; void strncpy(char *, const char *, int) ; void strncpy(char *, const char *, int)
; ;
strncpy: strncpy:
mov rcx, ax2 mov rcx, ax2
.1:
ret.cxz ret.cxz
.l:
mov rax, b[ax1] mov rax, b[ax1]
mov b[ax0], rax mov b[ax0], rax
add ax0, ax0, 1 add ax0, ax0, 1
add ax1, ax1, 1 add ax1, ax1, 1
sub rcx, rcx, 1
jmp .1 loop .l
ret
; ;
; void strnzcpy(char *, const char *, int) ; void strnzcpy(char *, const char *, int)
; ;
strnzcpy: strnzcpy:
mov rcx, ax2 mov rcx, ax2
ret.cxz
.1: .l:
jmp.cxz .2
mov rax, b[ax1] mov rax, b[ax1]
mov b[ax0], rax mov b[ax0], rax
b.z rax, zero, .3 jmp.axz .r
add ax0, ax0, 1 add ax0, ax0, 1
add ax1, ax1, 1 add ax1, ax1, 1
sub rcx, rcx, 1
jmp .1 loop .l
.2: .z:
mov b[ax0], zero mov b[ax0], zero
.3: .r:
ret ret

4
ka/doskrnl.k
View File

@ -26,6 +26,10 @@ start:
mov rsp, DOSKRNL_STACK mov rsp, DOSKRNL_STACK
mov rbp, zero mov rbp, zero
dump
mov rcx, 44
crash.cxz
call main call main
crash crash

3
ka/usr/cmd/dir.k
View File

@ -8,7 +8,6 @@ builtins.dir:
mov rbp, rsp mov rbp, rsp
push r12 push r12
mov r12, zero # no. of files found mov r12, zero # no. of files found
mov rcx, STRLEN_MAX mov rcx, STRLEN_MAX
@ -32,7 +31,7 @@ builtins.dir:
trap 0 trap 0
.list: .list:
b.z rax, 0, .end jmp.axz .end
; found something ; found something
add r12, r12, 1 add r12, r12, 1

53
ka/usr/cmd/main.k
View File

@ -18,7 +18,7 @@ main:
; empty argbuf ; empty argbuf
mov rcx, argbuf.size mov rcx, argbuf.size
mov rdx, argbuf mov rdx, argbuf
stosb.rep rdx, 0 stosb.rep rdx, zero
; iterator through argbuf ; iterator through argbuf
mov rcx, zero mov rcx, zero
@ -32,15 +32,15 @@ main:
; Fill .buf with user input ; Fill .buf with user input
scan rax scan rax
b.z rax, zero, .input_loop jmp.axz .input_loop
; backspace character? ; backspace character?
b.nz rax, 8, .handle_input b.nz rax, 8, .handle_input
; anything to delete? ; anything to delete?
b.z rcx, zero, .input_loop jmp.cxz .input_loop ; no
; delete it ; yes, delete it
sub rcx, rcx, 1 sub rcx, rcx, 1
add rdx, rcx, argbuf add rdx, rcx, argbuf
mov b[rdx], zero mov b[rdx], zero
@ -71,7 +71,7 @@ main:
.extract_argv0: .extract_argv0:
; did we read anything at all? ; did we read anything at all?
; if not, just go back to waiting input ; if not, just go back to waiting input
b.z rcx, zero, .print_prompt jmp.cxz .print_prompt
; find first whitespace or null-terminator ; find first whitespace or null-terminator
mov rcx, argbuf.size mov rcx, argbuf.size
@ -80,44 +80,44 @@ main:
; argv1 exists? if so, save its position ; argv1 exists? if so, save its position
mov rsi, rdx mov rsi, rdx
b.z b[rsi], zero, .no_argv1
add rsi, rsi, 1
.next_space: .next_space:
mov rcx, b[rsi] mov rcx, b[rsi]
b.z rdx, zero, .no_argv1 jmp.cxz .do_extract
; skip spaces ; skip spaces
cmp rdx, ' ' cmp rcx, ' '
add.z rsi, rsi, 1 add.z rsi, rsi, 1
jmp.z .next_space jmp.z .next_space
; if we're here, we found a
; non-zero non-space character
mov q[argv1pos], rsi mov q[argv1pos], rsi
; fallthrough ; fallthrough
.no_argv1: .do_extract:
; empty argv0 ; empty argv0
mov rcx, argbuf.size mov rcx, argbuf.size
mov rax, argv0 mov rax, argv0
stosb.rep rax, 0 stosb.rep rax, zero
; extract argv0 ; how much do we copy?
sub rcx, rdx, argbuf sub rcx, rdx, argbuf
mov rdx, argbuf
mov rax, argv0
.mmove:
jmp.cxz .detect_builtin jmp.cxz .detect_builtin
mov rsi, b[rdx]
mov b[rax], rsi
add rdx, rdx, 1
add rax, rax, 1
sub rcx, rcx, 1 sub rcx, rcx, 1
jmp .mmove mov rdi, argbuf
mov rsi, argv0
.copy_loop:
mov rax, b[rdi]
mov b[rsi], rax
add rdi, rdi, 1
add rsi, rsi, 1
loop .copy_loop
.detect_builtin: .detect_builtin:
@ -230,8 +230,8 @@ main:
mov rax, Sys.CloseFile mov rax, Sys.CloseFile
trap 0 trap 0
b.l rax, zero, .couldnt_read b.l rcx, zero, .couldnt_read
b.z rax, zero, .empty_file jmp.cxz .empty_file
mov rdx, FILE_LOADP mov rdx, FILE_LOADP
prns.rep rdx prns.rep rdx
@ -287,7 +287,6 @@ main:
.command_not_found: .command_not_found:
call print, argv0 call print, argv0
call print, .cnf_errmsg call print, .cnf_errmsg
jmp .print_prompt jmp .print_prompt
.cnf_errmsg = ": command not found\n" .cnf_errmsg = ": command not found\n"
@ -310,7 +309,7 @@ main:
jmp .print_prompt jmp .print_prompt
.ef_errmsg = "%s: %s: file is empty\n" .ef_errmsg = "%s: %s: file was empty\n"
.couldnt_read: .couldnt_read:
push q[argv1pos] push q[argv1pos]

19
vm/pc/DECD
View File

@ -19,21 +19,18 @@ FT2 Second operand format
Values for COND: Values for COND:
00000 (none) 00000 (none)
00001 .C 00001 .C .B
00010 .O 00010 .O
00011 .Z .E 00011 .Z .E
00100 .S 00100 .S
00101 .P 00101 .P
00110 .A 00110 .BE
00111 .AE 00111 .L
01000 .B 01000 .LE
01001 .BE 01001 .AXZ
01010 .G 01010 .BXZ
01011 .GE 01011 .CXZ
01100 .L 01100 .DXZ
01101 .LE
01110 .CXZ
01111 (reserved)
Highest (6th) bit of COND indicates negation Highest (6th) bit of COND indicates negation
Fx values: Fx values:

17
vm/pc/decode.h
View File

@ -4,11 +4,18 @@
enum enum
{ {
CD_NONE, CD_NONE,
CD_C,
CD_C, CD_O, CD_Z, CD_S, CD_P, CD_O,
CD_A, CD_AE, CD_B, CD_BE, CD_Z,
CD_G, CD_GE, CD_L, CD_LE, CD_S,
CD_CXZ, COND_RES, CD_P,
CD_BE,
CD_L,
CD_LE,
CD_AXZ,
CD_BXZ,
CD_CXZ,
CD_DXZ,
}; };
enum enum

5
vm/pc/dump.c
View File

@ -9,9 +9,8 @@ char *cond_suffixes[] =
{ {
"-", "-",
"c", "o", "z", "s", "p", "c", "o", "z", "s", "p",
"a", "ae", "b", "be", "be", "l", "le", "axz",
"g", "ge", "l", "le", "bxz", "cxz",
"cxz",
"?" "?"
}; };

13
vm/pc/exec.c
View File

@ -21,20 +21,15 @@ bool eval_cond(ctx_t *ctx, uint cond)
case CD_Z: ok = rfx&ZF; break; case CD_Z: ok = rfx&ZF; break;
case CD_S: ok = rfx&SF; break; case CD_S: ok = rfx&SF; break;
case CD_P: ok = rfx&PF; break; case CD_P: ok = rfx&PF; break;
case CD_A: ok = !(rfx&CF || rfx&ZF); break;
case CD_AE: ok = !(rfx&CF); break;
case CD_B: ok = rfx&CF; break; case CD_BE: ok = rfx&CF || rfx&ZF; break;
case CD_BE: ok = rfx&CF || rfx&ZF; break;
case CD_G: ok = !(rfx&ZF) && (!(rfx&SF) == !(rfx&OF)); break;
case CD_GE: ok = !(rfx&SF) == !(rfx&OF); break;
case CD_L: ok = !(rfx&SF) != !(rfx&OF); break; case CD_L: ok = !(rfx&SF) != !(rfx&OF); break;
case CD_LE: ok = rfx&ZF || (!(rfx&SF) != !(rfx&OF)); break; case CD_LE: ok = rfx&ZF || (!(rfx&SF) != !(rfx&OF)); break;
case CD_AXZ: ok = !R(RAX); break;
case CD_BXZ: ok = !R(RBX); break;
case CD_CXZ: ok = !R(RCX); break; case CD_CXZ: ok = !R(RCX); break;
case CD_DXZ: ok = !R(RDX); break;
default: default:
_except(ctx, E_ILL, "Invalid COND value: 0x%x", (neg?cond|(1<<4):cond)); _except(ctx, E_ILL, "Invalid COND value: 0x%x", (neg?cond|(1<<4):cond));