From 257f740ce8b5c981c2561774973fca1a9628d70b Mon Sep 17 00:00:00 2001 From: Andrew Alderwick Date: Sat, 17 Apr 2021 21:36:36 +0100 Subject: [PATCH 1/2] Updated device variables to latest versions --- projects/examples/blank.usm | 2 +- projects/examples/dev.audio.usm | 4 ++-- projects/examples/dev.console.usm | 2 +- projects/examples/dev.controller.keys.usm | 4 ++-- projects/examples/dev.file.usm | 4 ++-- projects/examples/gui.shapes.usm | 2 +- projects/examples/gui.wallpaper.usm | 2 +- projects/software/assembler.usm | 12 +++++++----- projects/software/left.usm | 4 ++-- projects/software/nasu.usm | 4 ++-- projects/software/neralie.usm | 4 ++-- projects/software/noodle.usm | 4 ++-- projects/software/orca.usm | 2 +- projects/tests/basics.usm | 2 +- projects/tests/opcodes.usm | 2 +- 15 files changed, 28 insertions(+), 26 deletions(-) diff --git a/projects/examples/blank.usm b/projects/examples/blank.usm index 48a9c32..81e1860 100644 --- a/projects/examples/blank.usm +++ b/projects/examples/blank.usm @@ -10,7 +10,7 @@ |0130 ;Audio { wave 2 envelope 2 pad 4 volume 1 pitch 1 play 1 value 2 delay 2 finish 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } |01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 refresh 1 } |0200 diff --git a/projects/examples/dev.audio.usm b/projects/examples/dev.audio.usm index 7d734fc..37e487e 100644 --- a/projects/examples/dev.audio.usm +++ b/projects/examples/dev.audio.usm @@ -27,12 +27,12 @@ ( devices ) |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 } -|0110 ;Console { pad 8 char 1 byte 1 short 2 } +|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } |0130 ;Audio { wave 2 envelope 2 pad 4 volume 1 pitch 1 play 1 value 2 delay 2 finish 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { pad 8 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } ( vectors ) diff --git a/projects/examples/dev.console.usm b/projects/examples/dev.console.usm index 736dc23..f937eee 100644 --- a/projects/examples/dev.console.usm +++ b/projects/examples/dev.console.usm @@ -4,7 +4,7 @@ ( devices ) -|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 } +|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } ( program ) diff --git a/projects/examples/dev.controller.keys.usm b/projects/examples/dev.controller.keys.usm index df4940d..2680f89 100644 --- a/projects/examples/dev.controller.keys.usm +++ b/projects/examples/dev.controller.keys.usm @@ -5,8 +5,8 @@ %8* { #0030 SFT2 } |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 } -|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 } -|0120 ;Screen { vector 2 pad 6 x 2 y 2 addr 2 color 1 } +|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } +|0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } |0140 ;Controller { vector 2 button 1 key 1 } ( program ) diff --git a/projects/examples/dev.file.usm b/projects/examples/dev.file.usm index f4a60c5..ec84284 100644 --- a/projects/examples/dev.file.usm +++ b/projects/examples/dev.file.usm @@ -14,10 +14,10 @@ ( devices ) |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 } -|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 } +|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } ( program ) diff --git a/projects/examples/gui.shapes.usm b/projects/examples/gui.shapes.usm index 0e83a9f..7417877 100644 --- a/projects/examples/gui.shapes.usm +++ b/projects/examples/gui.shapes.usm @@ -18,7 +18,7 @@ ;circle { xc 2 yc 2 x 2 y 2 r 2 d 2 } |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 } -|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 } +|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } ( program ) diff --git a/projects/examples/gui.wallpaper.usm b/projects/examples/gui.wallpaper.usm index fefe375..9f532ad 100644 --- a/projects/examples/gui.wallpaper.usm +++ b/projects/examples/gui.wallpaper.usm @@ -8,7 +8,7 @@ |0130 ;Audio { wave 2 envelope 2 pad 4 volume 1 pitch 1 play 1 value 2 delay 2 finish 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } |01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 refresh 1 } |0200 diff --git a/projects/software/assembler.usm b/projects/software/assembler.usm index a52b750..6944197 100644 --- a/projects/software/assembler.usm +++ b/projects/software/assembler.usm @@ -13,7 +13,7 @@ |0130 ;Audio { wave 2 envelope 2 pad 4 volume 1 pitch 1 play 1 value 2 delay 2 finish 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } |01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 refresh 1 } ( vectors ) @@ -834,11 +834,13 @@ @l-DateTime-second [ 0000 ] .l-DateTime-year [ second 00 ] [ 01 ] .DateTime.second @l-DateTime-year [ 0000 ] [ 0000 ] [ year 00 ] [ 02 ] .DateTime.year @l-File [ 0000 ] [ 0000 ] [ File 00 ] [ 80 ] .File .l-File-root -@l-File-length [ 0000 ] .l-File-load [ length 00 ] [ 02 ] .File.length -@l-File-load [ 0000 ] [ 0000 ] [ load 00 ] [ 02 ] .File.load +@l-File-length [ 0000 ] [ 0000 ] [ length 00 ] [ 02 ] .File.length +@l-File-load .l-File-length .l-File-name [ load 00 ] [ 02 ] .File.load +@l-File-name [ 0000 ] [ 0000 ] [ name 00 ] [ 02 ] .File.name @l-File-root -@l-File-name .l-File-length .l-File-save [ name 00 ] [ 02 ] .File.name -@l-File-save [ 0000 ] .l-File-vector [ save 00 ] [ 02 ] .File.save +@l-File-offset .l-File-load .l-File-save [ offset 00 ] [ 02 ] .File.offset +@l-File-result [ 0000 ] [ 0000 ] [ result 00 ] [ 02 ] .File.result +@l-File-save .l-File-result .l-File-vector [ save 00 ] [ 02 ] .File.save @l-File-vector [ 0000 ] [ 0000 ] [ vector 00 ] [ 02 ] .File.vector @l-Mouse .l-File .l-Screen [ Mouse 00 ] [ 80 ] .Mouse .l-Mouse-root @l-Mouse-chord [ 0000 ] .l-Mouse-state [ chord 00 ] [ 01 ] .Mouse.chord diff --git a/projects/software/left.usm b/projects/software/left.usm index 9e4079a..1254e98 100644 --- a/projects/software/left.usm +++ b/projects/software/left.usm @@ -43,11 +43,11 @@ ( devices ) |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 } -|0110 ;Console { pad 8 char 1 byte 1 short 2 } +|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } ( program ) diff --git a/projects/software/nasu.usm b/projects/software/nasu.usm index 03b3df1..93690e3 100644 --- a/projects/software/nasu.usm +++ b/projects/software/nasu.usm @@ -57,11 +57,11 @@ ( devices ) |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 } -|0110 ;Console { pad 8 char 1 byte 1 short 2 } +|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } ( program ) diff --git a/projects/software/neralie.usm b/projects/software/neralie.usm index 11a5d00..f307e8a 100644 --- a/projects/software/neralie.usm +++ b/projects/software/neralie.usm @@ -12,9 +12,9 @@ ;mul { ahi 1 alo 1 bhi 1 blo 1 } |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 } -|0110 ;Console { pad 8 char 1 byte 1 short 2 } +|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } -|01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 pad 4 refresh 1 } +|01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 refresh 1 } ( program ) diff --git a/projects/software/noodle.usm b/projects/software/noodle.usm index 30a9783..56543a1 100644 --- a/projects/software/noodle.usm +++ b/projects/software/noodle.usm @@ -51,11 +51,11 @@ ( devices ) |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 } -|0110 ;Console { pad 8 char 1 byte 1 short 2 string 2 } +|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } ( program ) diff --git a/projects/software/orca.usm b/projects/software/orca.usm index b364275..44cf048 100644 --- a/projects/software/orca.usm +++ b/projects/software/orca.usm @@ -46,7 +46,7 @@ ( devices ) |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 } -|0110 ;Console { pad 8 char 1 byte 1 short 2 } +|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } diff --git a/projects/tests/basics.usm b/projects/tests/basics.usm index ccf775b..a8cf19f 100644 --- a/projects/tests/basics.usm +++ b/projects/tests/basics.usm @@ -5,7 +5,7 @@ ( devices ) |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 } -|0110 ;Console { pad 8 char 1 byte 1 short 2 } +|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } ( program ) diff --git a/projects/tests/opcodes.usm b/projects/tests/opcodes.usm index d68b579..59beb96 100644 --- a/projects/tests/opcodes.usm +++ b/projects/tests/opcodes.usm @@ -11,7 +11,7 @@ ;counts { failed 2 passed 2 unknown 2 } ;number { started 1 } -|0100 ;Console { pad 8 char 1 byte 1 short 2 } +|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } |01F0 .RESET .FRAME .ERROR ( vectors ) %PASS? { ,result JMP2 BRK2r LITr EOR2 DUP } From 51bd0a919c62b5f866834b9127a261d322976acb Mon Sep 17 00:00:00 2001 From: Andrew Alderwick Date: Sat, 17 Apr 2021 21:49:33 +0100 Subject: [PATCH 2/2] Renamed File.result to File.success --- projects/examples/blank.usm | 2 +- projects/examples/dev.audio.usm | 2 +- projects/examples/dev.file.usm | 2 +- projects/examples/gui.picture.usm | 2 +- projects/examples/gui.wallpaper.usm | 2 +- projects/software/assembler.usm | 8 ++++---- projects/software/left.usm | 2 +- projects/software/nasu.usm | 2 +- projects/software/noodle.usm | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/examples/blank.usm b/projects/examples/blank.usm index 81e1860..5deb361 100644 --- a/projects/examples/blank.usm +++ b/projects/examples/blank.usm @@ -10,7 +10,7 @@ |0130 ;Audio { wave 2 envelope 2 pad 4 volume 1 pitch 1 play 1 value 2 delay 2 finish 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } |01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 refresh 1 } |0200 diff --git a/projects/examples/dev.audio.usm b/projects/examples/dev.audio.usm index 37e487e..3605b40 100644 --- a/projects/examples/dev.audio.usm +++ b/projects/examples/dev.audio.usm @@ -32,7 +32,7 @@ |0130 ;Audio { wave 2 envelope 2 pad 4 volume 1 pitch 1 play 1 value 2 delay 2 finish 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } ( vectors ) diff --git a/projects/examples/dev.file.usm b/projects/examples/dev.file.usm index ec84284..aa76e68 100644 --- a/projects/examples/dev.file.usm +++ b/projects/examples/dev.file.usm @@ -17,7 +17,7 @@ |0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } ( program ) diff --git a/projects/examples/gui.picture.usm b/projects/examples/gui.picture.usm index fa684c7..0b182b5 100644 --- a/projects/examples/gui.picture.usm +++ b/projects/examples/gui.picture.usm @@ -10,7 +10,7 @@ |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 } |0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 } |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } -|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } ( program ) diff --git a/projects/examples/gui.wallpaper.usm b/projects/examples/gui.wallpaper.usm index 9f532ad..5632b7b 100644 --- a/projects/examples/gui.wallpaper.usm +++ b/projects/examples/gui.wallpaper.usm @@ -8,7 +8,7 @@ |0130 ;Audio { wave 2 envelope 2 pad 4 volume 1 pitch 1 play 1 value 2 delay 2 finish 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } |01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 refresh 1 } |0200 diff --git a/projects/software/assembler.usm b/projects/software/assembler.usm index 6944197..001c5c8 100644 --- a/projects/software/assembler.usm +++ b/projects/software/assembler.usm @@ -13,7 +13,7 @@ |0130 ;Audio { wave 2 envelope 2 pad 4 volume 1 pitch 1 play 1 value 2 delay 2 finish 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } |01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 refresh 1 } ( vectors ) @@ -838,9 +838,9 @@ @l-File-load .l-File-length .l-File-name [ load 00 ] [ 02 ] .File.load @l-File-name [ 0000 ] [ 0000 ] [ name 00 ] [ 02 ] .File.name @l-File-root -@l-File-offset .l-File-load .l-File-save [ offset 00 ] [ 02 ] .File.offset -@l-File-result [ 0000 ] [ 0000 ] [ result 00 ] [ 02 ] .File.result -@l-File-save .l-File-result .l-File-vector [ save 00 ] [ 02 ] .File.save +@l-File-offset .l-File-load .l-File-success [ offset 00 ] [ 02 ] .File.offset +@l-File-save [ 0000 ] [ 0000 ] [ save 00 ] [ 02 ] .File.save +@l-File-success .l-File-save .l-File-vector [ success 00 ] [ 02 ] .File.success @l-File-vector [ 0000 ] [ 0000 ] [ vector 00 ] [ 02 ] .File.vector @l-Mouse .l-File .l-Screen [ Mouse 00 ] [ 80 ] .Mouse .l-Mouse-root @l-Mouse-chord [ 0000 ] .l-Mouse-state [ chord 00 ] [ 01 ] .Mouse.chord diff --git a/projects/software/left.usm b/projects/software/left.usm index 1254e98..3589c29 100644 --- a/projects/software/left.usm +++ b/projects/software/left.usm @@ -47,7 +47,7 @@ |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } ( program ) diff --git a/projects/software/nasu.usm b/projects/software/nasu.usm index 93690e3..c03038b 100644 --- a/projects/software/nasu.usm +++ b/projects/software/nasu.usm @@ -61,7 +61,7 @@ |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } ( program ) diff --git a/projects/software/noodle.usm b/projects/software/noodle.usm index 56543a1..9ca523f 100644 --- a/projects/software/noodle.usm +++ b/projects/software/noodle.usm @@ -55,7 +55,7 @@ |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 } |0140 ;Controller { vector 2 button 1 key 1 } |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 } -|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } +|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 } ( program )