Dariaceli's Git
Browse code

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

neauoire authored on 18/04/2021 00:27:31
Showing 16 changed files
projects/examples/blank.usm
History View file @ bcf95cb
... ... 
@@ -10,7 +10,7 @@
10 10 
 |0130 ;Audio { wave 2 envelope 2 pad 4 volume 1 pitch 1 play 1 value 2 delay 2 finish 1 }
11 11 
 |0140 ;Controller { vector 2 button 1 key 1 }
12 12 
 |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 }
13 
-|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 }
13 
+|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 }
14 14 
 |01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 refresh 1 }
15 15
16 16 
 |0200
projects/examples/dev.audio.usm
History View file @ bcf95cb
... ... 
@@ -27,12 +27,12 @@
27 27 
 ( devices )
28 28
29 29 
 |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
30 
-|0110 ;Console { pad 8 char 1 byte 1 short 2 }
30 
+|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
31 31 
 |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 }
32 32 
 |0130 ;Audio { wave 2 envelope 2 pad 4 volume 1 pitch 1 play 1 value 2 delay 2 finish 1 }
33 33 
 |0140 ;Controller { vector 2 button 1 key 1 }
34 34 
 |0160 ;Mouse  { vector 2 x 2 y 2 state 1 chord 1 }
35 
-|0170 ;File { pad 8 name 2 length 2 load 2 save 2 }
35 
+|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 }
36 36
37 37 
 ( vectors )
38 38
projects/examples/dev.console.usm
History View file @ bcf95cb
... ... 
@@ -4,7 +4,7 @@
4 4
5 5 
 ( devices )
6 6
7 
-|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 }
7 
+|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
8 8
9 9 
 ( program )
10 10
projects/examples/dev.controller.keys.usm
History View file @ bcf95cb
... ... 
@@ -5,8 +5,8 @@
5 5 
 %8*  { #0030 SFT2 }
6 6
7 7 
 |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
8 
-|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 }
9 
-|0120 ;Screen { vector 2 pad 6 x 2 y 2 addr 2 color 1 }
8 
+|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
9 
+|0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 }
10 10 
 |0140 ;Controller { vector 2 button 1 key 1 }
11 11
12 12 
 ( program )
projects/examples/dev.file.usm
History View file @ bcf95cb
... ... 
@@ -14,10 +14,10 @@
14 14 
 ( devices )
15 15
16 16 
 |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
17 
-|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 }
17 
+|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
18 18 
 |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 }
19 19 
 |0160 ;Mouse  { vector 2 x 2 y 2 state 1 chord 1 }
20 
-|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 }
20 
+|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 }
21 21
22 22 
 ( program )
23 23
projects/examples/gui.picture.usm
History View file @ bcf95cb
... ... 
@@ -10,7 +10,7 @@
10 10 
 |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
11 11 
 |0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
12 12 
 |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 }
13 
-|0170 ;File { vector 2 result 2 offset 2 pad 2 name 2 length 2 load 2 save 2 }
13 
+|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 }
14 14
15 15 
 ( program )
16 16
projects/examples/gui.shapes.usm
History View file @ bcf95cb
... ... 
@@ -18,7 +18,7 @@
18 18 
 ;circle { xc 2 yc 2 x 2 y 2 r 2 d 2 }
19 19
20 20 
 |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
21 
-|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 }
21 
+|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
22 22 
 |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 }
23 23
24 24 
 ( program )
projects/examples/gui.wallpaper.usm
History View file @ bcf95cb
... ... 
@@ -8,7 +8,7 @@
8 8 
 |0130 ;Audio { wave 2 envelope 2 pad 4 volume 1 pitch 1 play 1 value 2 delay 2 finish 1 }
9 9 
 |0140 ;Controller { vector 2 button 1 key 1 }
10 10 
 |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 }
11 
-|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 }
11 
+|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 }
12 12 
 |01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 refresh 1 }
13 13
14 14 
 |0200
projects/software/assembler.usm
History View file @ bcf95cb
... ... 
@@ -13,7 +13,7 @@
13 13 
 |0130 ;Audio { wave 2 envelope 2 pad 4 volume 1 pitch 1 play 1 value 2 delay 2 finish 1 }
14 14 
 |0140 ;Controller { vector 2 button 1 key 1 }
15 15 
 |0160 ;Mouse { vector 2 x 2 y 2 state 1 chord 1 }
16 
-|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 }
16 
+|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 }
17 17 
 |01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 refresh 1 }
18 18
19 19 
 ( vectors )
... ... 
@@ -834,11 +834,13 @@
834 834 
 @l-DateTime-second  [ 0000 ]         .l-DateTime-year  [ second 00 ]     [ 01 ] .DateTime.second
835 835 
 @l-DateTime-year   [ 0000 ]          [ 0000 ]         [ year 00 ]       [ 02 ] .DateTime.year
836 836 
 @l-File            [ 0000 ]          [ 0000 ]         [ File 00 ]       [ 80 ] .File .l-File-root
837 
-@l-File-length     [ 0000 ]         .l-File-load      [ length 00 ]     [ 02 ] .File.length
838 
-@l-File-load       [ 0000 ]          [ 0000 ]         [ load 00 ]       [ 02 ] .File.load
837 
+@l-File-length     [ 0000 ]          [ 0000 ]         [ length 00 ]     [ 02 ] .File.length
838 
+@l-File-load      .l-File-length    .l-File-name      [ load 00 ]       [ 02 ] .File.load
839 
+@l-File-name       [ 0000 ]          [ 0000 ]         [ name 00 ]       [ 02 ] .File.name
839 840 
 @l-File-root
840 
-@l-File-name      .l-File-length    .l-File-save      [ name 00 ]       [ 02 ] .File.name
841 
-@l-File-save       [ 0000 ]         .l-File-vector    [ save 00 ]       [ 02 ] .File.save
841 
+@l-File-offset    .l-File-load      .l-File-success   [ offset 00 ]     [ 02 ] .File.offset
842 
+@l-File-save       [ 0000 ]          [ 0000 ]         [ save 00 ]       [ 02 ] .File.save
843 
+@l-File-success   .l-File-save      .l-File-vector    [ success 00 ]    [ 02 ] .File.success
842 844 
 @l-File-vector     [ 0000 ]          [ 0000 ]         [ vector 00 ]     [ 02 ] .File.vector
843 845 
 @l-Mouse          .l-File           .l-Screen         [ Mouse 00 ]      [ 80 ] .Mouse .l-Mouse-root
844 846 
 @l-Mouse-chord     [ 0000 ]         .l-Mouse-state    [ chord 00 ]      [ 01 ] .Mouse.chord
projects/software/left.usm
History View file @ bcf95cb
... ... 
@@ -43,11 +43,11 @@
43 43 
 ( devices )
44 44
45 45 
 |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
46 
-|0110 ;Console { pad 8 char 1 byte 1 short 2 }
46 
+|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
47 47 
 |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 }
48 48 
 |0140 ;Controller { vector 2 button 1 key 1 }
49 49 
 |0160 ;Mouse  { vector 2 x 2 y 2 state 1 chord 1 }
50 
-|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 }
50 
+|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 }
51 51
52 52 
 ( program )
53 53
projects/software/nasu.usm
History View file @ bcf95cb
... ... 
@@ -57,11 +57,11 @@
57 57 
 ( devices )
58 58
59 59 
 |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
60 
-|0110 ;Console { pad 8 char 1 byte 1 short 2 }
60 
+|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
61 61 
 |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 }
62 62 
 |0140 ;Controller { vector 2 button 1 key 1 }
63 63 
 |0160 ;Mouse  { vector 2 x 2 y 2 state 1 chord 1 }
64 
-|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 }
64 
+|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 }
65 65
66 66 
 ( program )
67 67
projects/software/neralie.usm
History View file @ bcf95cb
... ... 
@@ -12,9 +12,9 @@
12 12 
 ;mul { ahi 1 alo 1 bhi 1 blo 1 }
13 13
14 14 
 |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
15 
-|0110 ;Console { pad 8 char 1 byte 1 short 2 }
15 
+|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
16 16 
 |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 }
17 
-|01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 pad 4 refresh 1 }
17 
+|01a0 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dotw 1 doty 2 isdst 1 refresh 1 }
18 18
19 19 
 ( program )
20 20
projects/software/noodle.usm
History View file @ bcf95cb
... ... 
@@ -51,11 +51,11 @@
51 51 
 ( devices )
52 52
53 53 
 |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
54 
-|0110 ;Console { pad 8 char 1 byte 1 short 2 string 2 }
54 
+|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
55 55 
 |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 }
56 56 
 |0140 ;Controller { vector 2 button 1 key 1 }
57 57 
 |0160 ;Mouse  { vector 2 x 2 y 2 state 1 chord 1 }
58 
-|0170 ;File { vector 2 pad 6 name 2 length 2 load 2 save 2 }
58 
+|0170 ;File { vector 2 success 2 offset 2 pad 2 name 2 length 2 load 2 save 2 }
59 59
60 60 
 ( program )
61 61
projects/software/orca.usm
History View file @ bcf95cb
... ... 
@@ -46,7 +46,7 @@
46 46 
 ( devices )
47 47
48 48 
 |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
49 
-|0110 ;Console { pad 8 char 1 byte 1 short 2 }
49 
+|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
50 50 
 |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 addr 2 color 1 }
51 51 
 |0140 ;Controller { vector 2 button 1 key 1 }
52 52 
 |0160 ;Mouse  { vector 2 x 2 y 2 state 1 chord 1 }
projects/tests/basics.usm
History View file @ bcf95cb
... ... 
@@ -5,7 +5,7 @@
5 5 
 ( devices )
6 6
7 7 
 |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
8 
-|0110 ;Console { pad 8 char 1 byte 1 short 2 }
8 
+|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
9 9
10 10 
 ( program )
11 11
projects/tests/opcodes.usm
History View file @ bcf95cb
... ... 
@@ -11,7 +11,7 @@
11 11 
 ;counts { failed 2 passed 2 unknown 2 }
12 12 
 ;number { started 1 }
13 13
14 
-|0100 ;Console { pad 8 char 1 byte 1 short 2 }
14 
+|0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 string 2 }
15 15 
 |01F0 .RESET .FRAME .ERROR ( vectors )
16 16
17 17 
 %PASS? { ,result JMP2 BRK2r LITr EOR2 DUP }