Skip to content

Commit 01c6bc8

Browse files
authored
Merge pull request DoctorWkt#234 from sebras/fix/adm
Change ald to assemble successfully and include it in build.
2 parents 61951f2 + 01db74c commit 01c6bc8

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

build/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ dirs:
112112
# PLEASE KEEP IN ALPHABETICAL ORDER!
113113
cmd: dirs \
114114
$(BINDIR)/adm \
115+
$(BINDIR)/ald \
115116
$(BINDIR)/apr \
116117
$(BINDIR)/as \
117118
$(BINDIR)/cas \
@@ -152,6 +153,9 @@ altcmd: dirs cmd \
152153
$(BINDIR)/adm: $(CMDSRC)/adm.s
153154
$(AS) $(ASARGS) -o $(BINDIR)/adm $(CMDSRC)/adm.s
154155

156+
$(BINDIR)/ald: $(CMDSRC)/ald.s
157+
$(AS) $(ASARGS) -o $(BINDIR)/ald $(CMDSRC)/ald.s
158+
155159
$(BINDIR)/apr: $(CMDSRC)/apr.s
156160
$(AS) $(ASARGS) -o $(BINDIR)/apr $(CMDSRC)/apr.s
157161

build/proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ dd drwr- -1 4
2323
pptout irwr- -1 13
2424
password frw-- -1 fs/password
2525
adm frwr- -1 bin/adm
26+
ald frwr- -1 bin/ald
2627
apr frwr- -1 bin/apr
2728
as frwr- -1 bin/as
2829
b frwr- -1 bin/b

src/cmd/ald.s

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ cloop:
7979
jmp 1f
8080
dac 0f
8181
lac fo
82-
sys write; obuf; 0;..
82+
sys write; obuf; 0:..
8383
1:
8484
lac fo
8585
sys close
@@ -229,6 +229,16 @@ putword: 0
229229
jmp putword i
230230
jmp putword i
231231

232+
ferror:
233+
lac buf
234+
dac 1f
235+
lac d1
236+
sys write; 1:..; 4
237+
lac d1
238+
sys write; 1f; 1
239+
jmp loop
240+
1: 077012
241+
232242
d1: 1
233243
d2048: 2048
234244
d14: 14

0 commit comments

Comments
 (0)