project tree reorg

Baron-von-Riedesel · Feb 10, 2020 · 1923fac · 1923fac
1 parent 2ac536e
commit 1923fac
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 27 deletions.
diff --git a/src/COPYING.txt → COPYING.txt b/src/COPYING.txt → COPYING.txt
diff --git a/src/History.txt → History.txt b/src/History.txt → History.txt
diff --git a/README.md b/README.md
diff --git a/src/Readme.txt → Readme.txt b/src/Readme.txt → Readme.txt
diff --git a/bin/TestC.exe → build/TestC.exe b/bin/TestC.exe → build/TestC.exe
diff --git a/bin/dos64stb.bin → build/dos64stb.bin b/bin/dos64stb.bin → build/dos64stb.bin
diff --git a/bin/mon64.exe → build/mon64.exe b/bin/mon64.exe → build/mon64.exe
diff --git a/bin/readme → build/readme b/bin/readme → build/readme
diff --git a/src/DOS64STB.asm b/src/DOS64STB.asm
@@ -516,7 +516,7 @@ backtoreal proc
     mov ds,ax
     mov es,ax
     mov ss,ax
-    movzx esp,wStkBot
+    mov sp,wStkBot
 
     mov eax,cr0
     and eax,7ffffffeh   ; disable protected-mode & paging
@@ -578,7 +578,7 @@ call_rmode proc
     mov es, ax
     shl bx,2
     mov ecx,ss:[bx]
-    mov dword ptr [esp].RMCS.regIP, ecx
+    mov [adjust], ecx       ;use the adjust var to temporarily store CS:IP
     mov bx, wStkBot
     sub bx, 40h
     sub wStkBot,(8+6+4+4)   ;saved RSP, 6 bytes unused, RMCS SS:SP, RMCS CS:IP
@@ -589,7 +589,7 @@ call_rmode proc
 @@:
     mov ax,ds
     mov ss,ax
-    movzx esp,bx
+    movzx esp,bx	;clear highword ESP, [ESP] is used below!
 
 ;--- disable paging & protected-mode
     mov eax,cr0
@@ -610,8 +610,7 @@ call_rmode proc
     pop ds
     pop fs
     pop gs
-    pop dword ptr cs:[adjust]	;use this field temporarily
-    lss sp,[esp]
+    lss sp,[esp+4]
     push cs:wFlags
     push DGROUP
     push offset backtopm
@@ -1279,13 +1278,13 @@ pcall_rmode label ptr far16
     dw offset call_rmode
     dw SEL_CODE16
 back_to_long::
-
-    xor eax,eax
-    mov ss,eax
     mov edx,DGROUP
     shl edx,4
     lea esi,[esp+edx]
+    xor eax,eax
+    mov ss,eax
     mov rsp,[esi+38h]
+    sti
     mov rdi,[rsp]
     cld
     movsq   ;copy 2Ah bytes back, don't copy CS:IP & SS:SP fields

diff --git a/src/MON64.asm b/src/MON64.asm
@@ -100,28 +100,55 @@ c_cmd proc
     ret
 c_cmd endp
 
-;--- enter address (for d cmd)
+;--- get a line of characters
+;--- rbx->buffer
+;--- esi=size of buffer
 
-a_cmd proc
-    invoke printf, CStr(<"enter start address for d cmd: ">)
-    mov rdi, 0
-    lea rbx, buffer
+getline proc
+    xor edi, edi
+    dec esi
 nextkey:
     mov ah,1
     int 21h
     cmp al,0dh
     jz enter_pressed
+    cmp al,08h
+    jz backspace_pressed
     mov [rbx+rdi],al
-    inc rdi
-    cmp rdi,lbuffer-1
+    inc edi
+    cmp edi,esi
     jnz nextkey
-    invoke printf,CStr(lf)
+    mov dl,0dh
+    mov ah,2
+    int 21h
+    jmp enter_pressed
+backspace_pressed:
+    mov dl,20h
+    mov ah,2
+    int 21h
+    cmp edi,0
+    jz nextkey
+    dec edi
+    mov dl,08h
+    mov ah,2
+    int 21h
+    jmp nextkey
 enter_pressed:    
+    mov byte ptr [rbx+rdi],0
+    ret
+getline endp
+
+;--- enter address (for d cmd)
+
+a_cmd proc
+    invoke printf, CStr(<"enter start address for d cmd: ">)
+    lea rbx, buffer
+    mov esi, lbuffer
+    call getline
     and edi,edi        ;at least 1 digit entered?
     jz done
-    mov byte ptr [rbx+rdi],0
     xor edi,edi
-    xor rsi,rsi
+    xor esi,esi
     .while byte ptr [rbx+rdi]
         mov al,byte ptr [rbx+rdi]
         sub al,'0'
@@ -143,13 +170,12 @@ enter_pressed:
     jz @F
     invoke printf, CStr(<"hint: magnitude of address > 48 bits, exceeds paging capacity",lf>)
 @@:
-    mov [address],rsi
+    mov address,rsi
 done:
     invoke printf, CStr(lf)
     ret
 error:
-    lea rsi, [buffer]
-    invoke printf, CStr(<lf,"%s?",lf>), rsi
+    invoke printf, CStr(<lf,"%s?",lf>), addr buffer
     ret
 
 a_cmd endp

diff --git a/src/Makefile b/src/Makefile
@@ -2,7 +2,7 @@
 # NMake makefile, makes dos64stb.bin and mon64.exe
 # needs JWasm and a 64-bit linker (MS link used here).
 
-ODIR=Release
+ODIR=..\build
 
 all: $(ODIR) $(ODIR)\mon64.exe
 

diff --git a/src/TestC.mak b/src/TestC.mak
@@ -2,7 +2,7 @@
 # NMake makefile, makes TestC.exe
 # needs JWasm and MSVC 64-bit
 
-ODIR=Release
+ODIR=..\build
 
 all: $(ODIR) $(ODIR)\TestC.exe