Merge branch 'dosbox' into next

Author: xsro

README.md

@@ -25,25 +25,25 @@ when you are editing `assembly` files ,you can right click at the editor panel,t
 
 ### Demo 1: Run and Debug Assembly
 
-|using TASM via DOSBox|using MASM via msdos-player|
-|-----|----|
-|![demo dosbox tasm](https://github.com/xsro/masm-tasm/raw/master/pics/demo_dosbox_tasm.gif)|![demo msdos-player masm](https://github.com/xsro/masm-tasm/raw/master/pics/demo_msdos_masm.gif)|
+| using TASM via DOSBox                                                                       | using MASM via msdos-player                                                                      |
+| ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------ |
+| ![demo dosbox tasm](https://github.com/xsro/masm-tasm/raw/master/pics/demo_dosbox_tasm.gif) | ![demo msdos-player masm](https://github.com/xsro/masm-tasm/raw/master/pics/demo_msdos_masm.gif) |
 
 When opened a ASM file in Editor, Right click on the Editor, then run or debug the code. Default mode is using `DOSBox` and `TASM`, you can change it in `preference->settings` like the second gif(using MASM via msdos-palyer).
 
 ### Demo 2: code Formate,Diagnose and more
 
-|Formate Codes|Diagnose|
-|----|-----|
-|![programmatic lanaguage features](https://github.com/xsro/masm-tasm/raw/master/pics/demo_PLFeature.gif)|![diagnose](https://github.com/xsro/masm-tasm/raw/master/pics/demo_diagnose_tasm.gif)|
+| Formate Codes                                                                                            | Diagnose                                                                              |
+| -------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
+| ![programmatic lanaguage features](https://github.com/xsro/masm-tasm/raw/master/pics/demo_PLFeature.gif) | ![diagnose](https://github.com/xsro/masm-tasm/raw/master/pics/demo_diagnose_tasm.gif) |
 
 The extension offer some programmatic features like "hover","formate","jump to definition",you can close them in the `preferece->settings`
 
 ### Demo 3: Open dosbox and type the command you need
 
-|Single-File (command `Open DOSBox`)|Multi-Files (command `Dosbox here`)|
-|---|---|
-|![Open in Dosbox](https://github.com/xsro/masm-tasm/raw/master/pics/opendosbox.gif)|[![pacman](https://github.com/xsro/masm-tasm/raw/master/pics/demo_pacman.gif)](https://github.com/dpisdaniel/assembly-pacman)|
+| Single-File (command `Open DOSBox`)                                                 | Multi-Files (command `Dosbox here`)                                                                                           |
+| ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| ![Open in Dosbox](https://github.com/xsro/masm-tasm/raw/master/pics/opendosbox.gif) | [![pacman](https://github.com/xsro/masm-tasm/raw/master/pics/demo_pacman.gif)](https://github.com/dpisdaniel/assembly-pacman) |
 
 - some ASM commands you may need: [ASM_commands](https://github.com/xsro/masm-tasm/blob/master/doc/ASM_commands.md).
 - Some interesting assembly codes you may need: [DOSBox ASM codes](https://github.com/xsro/masm-tasm/wiki/dosbox)
@@ -93,12 +93,11 @@ Folder dosbox and player are emulator for windows and this extension will not us
 
 The extension will mount some folder to DOSBox 's disk. Please don't modify them.
 
-|in DOSBox|real path in the computor|
-|---|---|
-|C:|the path of tools folder|
-|D:|the path of the work space|
-|E:|the path of the editor file's folder(when using command `dosbox here`)|
-|X:|the path of some scripts for the extension to use|
+| in DOSBox | real path in the computor                                              |
+| --------- | ---------------------------------------------------------------------- |
+| C:        | the path of tools folder                                               |
+| D:        | the path of the work space                                             |
+| E:        | the path of the editor file's folder(when using command `dosbox here`) |
 
 ## Docs & Thanks & Licenses
 

package.json

@@ -3,7 +3,7 @@
   "displayName": "MASM/TASM",
   "publisher": "xsro",
   "description": "DOS汇编语言开发环境和语法支持，win下安装即用,自带DOSBox.exe和TASM/MASM工具",
-  "version": "0.3.1",
+  "version": "0.4.0-dev",
   "keywords": [
     "dosbox",
     "16位",

scripts/boxasm.bat

@@ -1,45 +1,62 @@
 ::this batch file will be used in dosbox by vscode extension
 @echo off
-
 if exist T.exe del T.exe
 if exist T.OBJ del T.OBJ
+if exist T.lst del T.lst
 if "%1"=="MASM" goto MASM
 if "%1"=="TASM" goto TASM
+echo %1 is not MASM or TASM
 goto end
+
 :MASM
 set path=%path%;c:\masm
+echo ...masm T.asm;
 masm T.ASM;>T.txt
+echo ...link T.obj;
 link T.OBJ;>>T.txt
 if  exist T.exe goto MASMNEXT
-exit
-:MASMNEXT
-if "%2"=="run" goto run
-if "%2"=="debug" goto MASMdebug
-goto end
-
+goto ERR
 :TASM
 set path=%path%;c:\tasm
+echo ...tasm T.ASM
 tasm /zi T.ASM>T.txt
+echo ...tlink T.OBJ
 tlink /v/3 T.OBJ>>T.txt
 if  exist T.exe goto TASMNEXT
-exit
+goto ERR
+
+:MASMNEXT
+if "%2"=="run" goto run
+if "%2"=="debug" goto MASMdebug
+echo %2 is not run or debug
+goto end
 :TASMNEXT
 if "%2"=="run" goto run
 if "%2"=="debug" goto TASMdebug
+echo %2 is not run or debug
+goto end
 
 :MASMdebug
+echo ...debug T.EXE
 debug T.EXE
-exit
+goto end
 :TASMdebug
 if exist c:\tasm\TDC2.TD copy c:\tasm\TDC2.TD TDCONFIG.TD
+echo ...TD T.EXE
 TD T.EXE
+goto end
+
+:ERR
+echo assemble FAILED, Output has been redireted to VSCODE's output pannel
 exit
 :run
+echo ...T.EXE
 T.EXE
 echo (END)
 echo ----------------------------------------------------------
 echo The symbol "(END)" means there is the END of your program's output
+:end
 if "%3"=="p" pause
-if "%3"=="k" goto end
+if "%3"=="k" goto final
 exit
-:end
+:final

scripts/work/ignore.txt

@@ -1 +1 @@
-masmtasm 工作文件夹，本文件可以自行删除
+This file is used to make sure workspace of xsro.masm-tasm exist

src/DOSBox.ts

@@ -17,7 +17,7 @@ export class DOSBox {
     public openDOSBox(conf: Config, more?: string, doc?: TextDocument, diag?: AssemblerDiag) {
         let boxcmd: string = '@echo off\n';
         //mount the necessary path
-        boxcmd += `mount c \\\"${conf.path}\\\"\nmount d \\\"${conf.workpath}\\\"\nmount x \\\"${conf.batchpath}\\\"\n`;
+        boxcmd += `mount c \\\"${conf.path}\\\"\nmount d \\\"${conf.workpath}\\\"\n`;
         //switch to the working space and add path\
         boxcmd += "d:\nset PATH=%%PATH%%;c:\\tasm;c:\\masm\n";
         if (doc) { boxcmd += "echo Your file has been copied as D:\\T.ASM\n"; };
@@ -30,15 +30,20 @@ export class DOSBox {
         //command for open dosbox
         let command = conf.OpenDosbox + ' -conf "' + conf.dosboxconfuri.fsPath + '" ';
         //exec command by terminal
-        let callback = (error: any) => {
-            if (error) { console.error(error); };
-            if (diag && doc) { this.BOXdiag(conf, diag, doc); }
+        let callback = (error: any, stdout: string, stderr: string) => {
+            if (error) { console.error(error); }
+            else {
+                if (diag && doc) { this.BOXdiag(conf, diag, doc); }
+                console.log(stderr, stdout);
+            }
         };
         if (process.platform === 'win32') {
+            if (more) { command = "copy/Y ..\\boxasm.bat boxasm.bat & " + command; }
             if (doc) { command = 'del/Q T*.* & copy "' + doc.fileName + '" "T.ASM" & ' + command; }
             exec(command + boxcommand, { cwd: conf.workpath, shell: 'cmd.exe' }, callback);
         }
         else {
+            if (more) { command = "cp ../boxasm.bat ./; " + command; }
             if (doc) { command = 'rm -f [Tt]*.*;cp "' + doc.fileName + '" T.ASM;' + command; }
             exec(command + boxcommand, { cwd: conf.workpath }, callback);
         }

src/MSDOS-player.ts

@@ -87,7 +87,7 @@ export class MSDOSplayer {
         else {
             let box = new DOSBox();
             if (runordebug) {
-                box.openDOSBox(conf, 'T.EXE\n' + conf.boxruncmd);
+                box.openDOSBox(conf, 'T.EXE' + conf.boxruncmd);
             }
             else {
                 box.openDOSBox(conf, debug);

src/configration.ts

@@ -107,8 +107,9 @@ export class Config {
         let command: string = ' ';
         switch (this._BOXrun) {
             case "keep": command = ' '; break;
-            case "exit after run": command = 'exit'; break;
-            case "pause then exit after run": command = 'pause \n exit'; break;
+            case "exit": command = '\n exit'; break;
+            case "pause":
+            default: command = '\n pause \n exit'; break;
         }
         return command;
     }
@@ -119,8 +120,9 @@ export class Config {
         let param: string = ' ';
         switch (this._BOXrun) {
             case "keep": param = 'k'; break;
-            case "exit after run": param = 'e'; break;
-            case "pause then exit after run": param = 'p'; break;
+            case "exit": param = 'e'; break;
+            case "pause":
+            default: param = 'p'; break;
         }
         return param;
     }

src/runcode.ts

@@ -40,7 +40,7 @@ export class AsmAction {
         switch (this._config.DOSemu) {
             case 'msdos player': this.msdosplayer.PlayerASM(this._config, true, true, this.landiag, doc); break;
             case 'dosbox':
-                let text = 'x:\\boxasm.bat ' + this._config.MASMorTASM + ' run ' + this._config.boxrunbat;
+                let text = 'boxasm.bat ' + this._config.MASMorTASM + ' run ' + this._config.boxrunbat;
                 this.dosbox.openDOSBox(this._config, text, doc, this.landiag);
                 break;
             case 'auto': this.msdosplayer.PlayerASM(this._config, true, false, this.landiag, doc); break;
@@ -63,7 +63,7 @@ export class AsmAction {
             this.msdosplayer.PlayerASM(this._config, false, inplayer, this.landiag, doc);
         }
         else {
-            let text = 'x:\\boxasm.bat ' + this._config.MASMorTASM + ' debug';
+            let text = 'boxasm.bat ' + this._config.MASMorTASM + ' debug';
             this.dosbox.openDOSBox(this._config, text, doc, this.landiag);
         }
     }