From b409f35c7c3ea5116bd41e205dbd0cf0910f92e5 Mon Sep 17 00:00:00 2001 From: julianb0 Date: Mon, 5 Aug 2019 16:06:37 +0200 Subject: [PATCH] vm --- ka/usr/cmd/main.k | 4 ++-- vm/pc/regs.c | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ka/usr/cmd/main.k b/ka/usr/cmd/main.k index cbcf8ab..c36eea0 100644 --- a/ka/usr/cmd/main.k +++ b/ka/usr/cmd/main.k @@ -351,14 +351,14 @@ main: .helpmsg.dir = " DIR Print contents of current directory\n" .helpmsg.dump = " DUMP Toggles debug instruction dumping\n" .helpmsg.echo = " ECHO Write arguments to standard output\n" -.helpmsg.erase = " ERASE Empties a file, making it blank\n" +.helpmsg.erase = " ERASE Clear a file, making it blank\n" .helpmsg.exit = " EXIT Initiate machine shutdown\n" .helpmsg.help = " HELP Display these messages\n" .helpmsg.halt = " HALT Put processor in halt mode\n" .helpmsg.make = " MAKE Create an empty file\n" .helpmsg.print = " PRINT Display contents of text file\n" .helpmsg.prompt = " PROMPT Change the command line prompt\n" -.helpmsg.remove = " REMOVE Deletes a file (permanently)\n" +.helpmsg.remove = " REMOVE Delete a file (permanently)\n" .helpmsg.time = " TIME Display current time of day\n" .helpmsg.ver = " VERS Display current COMMAND.COM version\n" diff --git a/vm/pc/regs.c b/vm/pc/regs.c index d816035..afc5971 100644 --- a/vm/pc/regs.c +++ b/vm/pc/regs.c @@ -25,10 +25,13 @@ void dumpregs() { TRACE("Current RFRAME index: #%lu", rfs_current_idx); - TRACE("\n\nEnviron:"); + TRACE("\n\nEnviron #1:"); TRACE("\nrpc=0x%-16lX rip=0x%-16lX rfx=0x%-16lX", ctx->cur_pc, R(RIP), R(RFX)); - TRACE("\nrsp=0x%-16lX rbp=0x%-16lX trp=0x%-16lX", R(RSP), R(RBP), R(TRP)); - TRACE("\nfc0=0x%-16lu cr0=0x%-16lX cr1=0x%-16lX", ctx->ninstrs, R(CR0), R(CR1)); + TRACE("\ncr0=0x%-16lX cr1=0x%-16lX cr2=0x%-16lX", R(CR0), R(CR1), R(CR2)); + + TRACE("\n\nEnviron #2:"); + TRACE("\nrsp=0x%-16lX rbp=0x%-16lX nin=0d%-16lu", R(RSP), R(RBP), ctx->ninstrs); + TRACE("\ngrp=0x%-16lX trp=0x%-16lX srp=0x%-16lX", R(GRP), R(TRP), R(SRP)); TRACE("\n\nArgument:"); TRACE("\nax0=0x%-16lX ax1=0x%-16lX ax2=0x%-16lX", R(AX0), R(AX1), R(AX2));