Skip to content

Commit

Permalink
*
Browse files Browse the repository at this point in the history
  • Loading branch information
Ismael-VC committed Jul 6, 2024
1 parent c93946d commit ce453da
Show file tree
Hide file tree
Showing 11 changed files with 5,517 additions and 5,586 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/makefile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup
run: |
mkdir -p ~/bin ~/roms
echo ~/bin >> $GITHUB_PATH
echo ~/bin >> $GITHUB_PATH
- name: Install UXN
run: |
Expand All @@ -26,7 +26,7 @@ jobs:
cd uxn11
make
make install
- name: Build Merlin OS
run: make test

Expand Down
2 changes: 0 additions & 2 deletions config/data.tal
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
(
@|config/data )

@uname "Ismael \0
4 changes: 0 additions & 4 deletions config/routines.tal
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ the dictionary in `symbols.tal` for them to become available within Merlin OS. )
@ready ( -- ) ;&ready !pstr
&ready READY

@greeting ( -- ) ;&hello pstr ;uname pstr ;&end !pstr
&hello [ "Welcome \s "back \s \0 ]
&end [ "! \n \0 ]

@banner ( -- )
.FORTH-PROMPT ?{
.PRINT-BANNER NOT ?{
Expand Down
1 change: 0 additions & 1 deletion config/startup.tal
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ Label definitions, routines, data and buffers must be defined in `setup.tal`. )
&|forth-banner )

banner
greeting
ready
2 changes: 0 additions & 2 deletions config/symbols.tal
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
( Operator Defined Symbol Table

=SYMBOL >> NAME \0 )
=greeting >> "greeting \0
=uname >> "uname \0
=buff >> "buff \0
=DEBUG >> "DEBUG \0
8 changes: 4 additions & 4 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ run: install
@ echo "Running: ~/${BIN_DIR}/${ID}"
@ ${ID}

test: install
@ echo "Testing: ~/${ROM_DIR}/${ID}.rom"
@ echo "~test/routines.tal \n sierpinski" | ${EMU} ${ROM_DIR}/${ID}.rom

setup:
@ echo "Setting up: ~/{${BIN_DIR},${ROMS_DIR}}"
@ mkdir -p ~/${BIN_DIR} ~/${ROMS_DIR}
Expand Down Expand Up @@ -56,6 +52,10 @@ install: setup backup build dump symbols disassemble
@ cp ${BIN_DIR}/* ~/${BIN_DIR}
@ cp ${ROM_DIR}/* ~/${ROMS_DIR}

test: install
@ echo "Testing: ~/${ROM_DIR}/${ID}.rom"
@ echo "~test/routines.tal \n sierpinski" | ${EMU} ${ROM_DIR}/${ID}.rom

cli: install
@ echo "Running: ~/${BIN_DIR}/${ID}-cli"
@ ${ID}-cli
Expand Down
Binary file modified rom/merlin.rom
Binary file not shown.
Loading

0 comments on commit ce453da

Please sign in to comment.