uxn

Varvara Ordinator, written in ANSI C(SDL2)
git clone https://git.eamoncaddigan.net/uxn.git
Log | Files | Refs | README | LICENSE

commit bcf95cbadbca270fb3a05f1097d69cfe93d3f079
parent a4d4b26424f639d6688a37451ec8aaaccda6f0a7
Author: neauoire <aliceffekt@gmail.com>
Date:   Sat, 17 Apr 2021 17:27:31 -0700

Merge branch 'master' of git.sr.ht:~rabbits/uxn

Diffstat:
Mprojects/examples/blank.usm | 2+-
Mprojects/examples/dev.audio.usm | 4++--
Mprojects/examples/dev.console.usm | 2+-
Mprojects/examples/dev.controller.keys.usm | 4++--
Mprojects/examples/dev.file.usm | 4++--
Mprojects/examples/gui.picture.usm | 2+-
Mprojects/examples/gui.shapes.usm | 2+-
Mprojects/examples/gui.wallpaper.usm | 2+-
Mprojects/software/assembler.usm | 12+++++++-----
Mprojects/software/left.usm | 4++--
Mprojects/software/nasu.usm | 4++--
Mprojects/software/neralie.usm | 4++--
Mprojects/software/noodle.usm | 4++--
Mprojects/software/orca.usm | 2+-
Mprojects/tests/basics.usm | 2+-
Mprojects/tests/opcodes.usm | 2+-
16 files changed, 29 insertions(+), 27 deletions(-)

diff --git 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 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 @@ -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 success 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 @@ -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 @@ -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 @@ -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 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 @@ -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.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 @@ -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 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 @@ -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 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 ) @@ -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-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 @@ -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 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 @@ -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 success 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 @@ -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 @@ -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 success 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 @@ -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 @@ -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 @@ -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 }