Skip to content

Commit 6818d93

Browse files
committed
update doc and ci
1 parent cf9c4c6 commit 6818d93

File tree

6 files changed

+46
-3
lines changed

6 files changed

+46
-3
lines changed

.github/workflows/vscode.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [macos-latest, ubuntu-latest, windows-latest]
14-
fail-fast: false
14+
# fail-fast: false
1515
runs-on: ${{ matrix.os }}
1616
steps:
1717
- uses: actions/setup-node@v2

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ These projects are not actively maintained.
55
Bugs will be fixed to my best but new features is difficult for me to add.
66

77
Please contact me if you are interested in maintaining this project.
8+
9+
| | masm-tasm|vscode-dosbox|
10+
|---|----------|-------------|
11+
|English|[README](./masm-tasm/README.md)|[README](./vscode-dosbox/README.md)|
12+
|中文|[README.zh](./masm-tasm/README.zh.md)|[README.zh](./vscode-dosbox/README.zh.md)|

masm-tasm/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@
66

77
Thanks to [Asttear][github:Asttear] for debugging and fixing [#37][issue:37]
88

9+
- 1.1.1: fix [#43][issue:43]Format error when use simplified segment definition [#44][issue:44] ASCII character hover
10+
911
修复格式化的时候文档被还原为初始文档的问题[#37][issue:37]。该bug影响较广,非常抱歉。
1012
感谢[Asttear][github:Asttear]报告并帮助修复:heart:
1113

14+
- 1.1.1: 修复 [#43][issue:43]简化段定义格式化错误 [#44][issue:44]未能区分ASCII大小写
15+
1216
[github:Asttear]: https://github.com/Asttear
1317
[issue:37]: https://github.com/dosasm/masm-tasm/issues/37 "格式化时文件被还原"
18+
[issue:43]: https://github.com/dosasm/masm-tasm/issues/43 "简化段定义格式化错误"
19+
[issue:44]: https://github.com/dosasm/masm-tasm/issues/44 "未能区分ASCII大小写"
20+
1421

1522
## 1.0 Web Extension Support 浏览器端支持
1623

masm-tasm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "MASM/TASM",
44
"publisher": "xsro",
55
"description": "run MASM/TASM assembly in DOSBox 汇编语言开发插件",
6-
"version": "1.1.0",
6+
"version": "1.1.1",
77
"keywords": [
88
"dosbox",
99
"16位",

masm-tasm/samples/test.asm

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
.model small
2+
.STACK 1024
3+
.data
4+
message db 8 dup(?),0dh,0ah,"$"
5+
.code
6+
main: mov ax,@data ;主程序开始
7+
mov ds,ax
8+
mov al,"A" ;子程序参数1
9+
mov si,offset message ;子程序参数2
10+
call BinToAsc ;调用子程序BinToAsc
11+
mov ah,9
12+
mov dx,offset message
13+
int 21h ;显示字符串
14+
mov ax,4c00h
15+
int 21h ;主程序结束
16+
17+
BinToAsc PROC ;子程序开始
18+
push cx
19+
push si
20+
mov cx,8
21+
L1: shl al,1 ;逻辑左移
22+
mov BYTE PTR [si],"0"
23+
jnc L2 ;CF=0则跳转
24+
mov BYTE PTR [si],"1"
25+
L2: inc si
26+
loop L1
27+
pop si
28+
pop cx
29+
ret
30+
BinToAsc ENDP ;子程序结束
31+
end main

vscode-dosbox/src/dosbox/dosbox.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class DOSBox implements api.Dosbox {
4646
return new Promise<DosboxResult>((resolve, reject) => {
4747
const p = cp.exec(command, { cwd: this.cwd }, (error, stdout, stderr) => {
4848
if (error) {
49-
logger.error(error, p, this);
49+
logger.error(JSON.stringify(error), p, this);
5050
vscode.window.showErrorMessage(
5151
"can't open dosbox with command: " + command + "cwd:" + this.cwd
5252
);

0 commit comments

Comments
 (0)