Browse code

Implement File/append flag.

Andrew Alderwick authored on 05/11/2021 22:48:04
Showing 17 changed files
... ...
@@ -21,7 +21,7 @@
21 21
 |60 @Audio3     [ &vector $2 &position $2 &output $1 &pad   $3 &adsr   $2 &length $2 &addr $2 &volume $1 &pitch $1 ]
22 22
 |80 @Controller [ &vector $2 &button   $1 &key    $1 ]
23 23
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &wheel  $1 ]
24
-|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save   $2 &stat $2 &delete $1 ]
24
+|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save   $2 &stat $2 &delete $1 &append $1 ]
25 25
 |b0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty   $2 &isdst $1 ]
26 26
 
27 27
 ( variables )
... ...
@@ -2,7 +2,7 @@
2 2
 
3 3
 |00 @System     [ &vector $2 &wst      $1 &rst    $1 &pad   $4 &r $2 &g $2 &b $2   &debug $1 &halt $1 ]
4 4
 |10 @Console    [ &vector $2 &read     $1 &pad    $5 &write $1 &error  $1 ]
5
-|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 ]
5
+|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
6 6
 
7 7
 ( vectors )
8 8
 
... ...
@@ -30,7 +30,7 @@
30 30
 |70 @Midi       [ &vector $2 &channel  $1 &note   $1 &velocity $1 ]
31 31
 |80 @Controller [ &vector $2 &button   $1 &key    $1 ]
32 32
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &wheel $1 ]
33
-|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 ]
33
+|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
34 34
 
35 35
 ( variables )
36 36
 
... ...
@@ -12,7 +12,7 @@
12 12
 
13 13
 |00 @System  &vector $2 &pad     $6 &r      $2 &g     $2 &b      $2
14 14
 |20 @Screen  &vector $2 &width   $2 &height $2 &pad   $2 &x      $2 &y      $2 &addr $2 &pixel $1 &sprite $1
15
-|a0 @File    &vector $2 &name    $2 &length $2 &success $2 &load $2 &save   $2 &stat $2 &delete $1
15
+|a0 @File    &vector $2 &name    $2 &length $2 &success $2 &load $2 &save   $2 &stat $2 &delete $1 &append $1
16 16
 
17 17
 ( variables )
18 18
 
... ...
@@ -27,7 +27,7 @@
27 27
 |70 @Midi       [ &vector $2 &channel  $1 &note   $1 &velocity $1 ]
28 28
 |80 @Controller [ &vector $2 &button   $1 &key    $1 ]
29 29
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &wheel  $1 ]
30
-|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 ]
30
+|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
31 31
 
32 32
 ( variables )
33 33
 
... ...
@@ -4,7 +4,7 @@
4 4
 
5 5
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
6 6
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1 ]
7
-|a0 @File   [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 ]
7
+|a0 @File   [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
8 8
 
9 9
 ( variables )
10 10
 
... ...
@@ -3,7 +3,7 @@
3 3
 ( devices )
4 4
 
5 5
 |00 @System     [ &vector $2 &pad    $6 &r      $2 &g     $2 &b      $2 ]
6
-|a0 @File       [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 ]
6
+|a0 @File       [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
7 7
 
8 8
 ( variables )
9 9
 
... ...
@@ -8,7 +8,7 @@
8 8
 |00 @System     [ &vector $2 &pad    $6 &r      $2 &g     $2 &b      $2 ]
9 9
 |10 @Console    [ &pad    $8 &write  $1 ]
10 10
 |20 @Screen     [ &vector $2 &width  $2 &height $2 &pad   $2 &x      $2 &y $2 &addr $2 &pixel $1 &sprite $1 ]
11
-|a0 @File       [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 ]
11
+|a0 @File       [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
12 12
 
13 13
 ( variables )
14 14
 
... ...
@@ -7,7 +7,7 @@
7 7
 
8 8
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
9 9
 |20 @Screen [ &vector $2 &width $2 &height $2 &auto $1 &pad $1 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1 ]
10
-|a0 @File [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 ]
10
+|a0 @File [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
11 11
 
12 12
 ( variables )
13 13
 
... ...
@@ -24,6 +24,9 @@
24 24
 )
25 25
 
26 26
 @asma-assemble-file ( src-filename* dest-filename* -- )
27
+	#01 .File/append DEO
28
+	DUP2 .File/name DEO2
29
+	#01 .File/delete DEO
27 30
 	;asma/dest-filename STA2 ;asma/src-filename STA2
28 31
 
29 32
 	;asma-init-first-pass JSR2
... ...
@@ -2,7 +2,7 @@
2 2
 
3 3
 |00 @System     [ &vector $2 &wst  $1 &rst    $1 &pad   $4 &r $2 &g $2 &b $2   &debug $1 &halt $1 ]
4 4
 |10 @Console    [ &vector $2 &read $1 &pad    $5 &write $1 &error  $1 ]
5
-|a0 @File       [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 ]
5
+|a0 @File       [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
6 6
 
7 7
 ( vectors )
8 8
 
... ...
@@ -35,7 +35,7 @@
35 35
 |30 @Audio0     [ &vector $2 &position $2 &output $1 &pad   $3 &adsr   $2 &length $2 &addr $2 &volume $1 &pitch $1 ]
36 36
 |80 @Controller [ &vector $2 &button   $1 &key    $1 ]
37 37
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &wheel  $1 ]
38
-|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 ]
38
+|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
39 39
 
40 40
 ( variables )
41 41
 
... ...
@@ -22,7 +22,7 @@
22 22
 |20 @Screen  &vector $2 &width   $2 &height $2 &auto $1 &pad $1 &x      $2 &y      $2 &addr $2 &pixel $1 &sprite $1
23 23
 |80 @Controller [ &vector $2 &button $1 &key    $1 ]
24 24
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &wheel  $1 ]
25
-|a0 @File    &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1
25
+|a0 @File    &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1
26 26
 |b0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
27 27
 
28 28
 ( variables )
... ...
@@ -107,11 +107,11 @@ file_read(void *dest, Uint16 len)
107 107
 }
108 108
 
109 109
 Uint16
110
-file_write(void *src, Uint16 len)
110
+file_write(void *src, Uint16 len, Uint8 flags)
111 111
 {
112 112
 	if(state != FILE_WRITE) {
113 113
 		reset();
114
-		if((f = fopen(current_filename, "ab")) != NULL)
114
+		if((f = fopen(current_filename, (flags & 0x01) ? "ab" : "wb")) != NULL)
115 115
 			state = FILE_WRITE;
116 116
 	}
117 117
 	if(state == FILE_WRITE)
... ...
@@ -12,6 +12,6 @@ WITH REGARD TO THIS SOFTWARE.
12 12
 
13 13
 void file_prepare(void *filename);
14 14
 Uint16 file_read(void *dest, Uint16 len);
15
-Uint16 file_write(void *src, Uint16 len);
15
+Uint16 file_write(void *src, Uint16 len, Uint8 flags);
16 16
 Uint16 file_stat(void *dest, Uint16 len);
17 17
 Uint16 file_delete();
... ...
@@ -87,7 +87,7 @@ file_deo(Device *d, Uint8 port)
87 87
 		poke16(d->dat, 0x6, file_read(&d->mem[peek16(d->dat, 0x8)], peek16(d->dat, 0x4)));
88 88
 		break;
89 89
 	case 0xb:
90
-		poke16(d->dat, 0x6, file_write(&d->mem[peek16(d->dat, 0xa)], peek16(d->dat, 0x4)));
90
+		poke16(d->dat, 0x6, file_write(&d->mem[peek16(d->dat, 0xa)], peek16(d->dat, 0x4), d->dat[0xf]));
91 91
 		break;
92 92
 	case 0xd:
93 93
 		poke16(d->dat, 0x6, file_stat(&d->mem[peek16(d->dat, 0xc)], peek16(d->dat, 0x4)));
... ...
@@ -379,7 +379,7 @@ file_deo(Device *d, Uint8 port)
379 379
 		poke16(d->dat, 0x6, file_read(&d->mem[peek16(d->dat, 0x8)], peek16(d->dat, 0x4)));
380 380
 		break;
381 381
 	case 0xb:
382
-		poke16(d->dat, 0x6, file_write(&d->mem[peek16(d->dat, 0xa)], peek16(d->dat, 0x4)));
382
+		poke16(d->dat, 0x6, file_write(&d->mem[peek16(d->dat, 0xa)], peek16(d->dat, 0x4), d->dat[0xf]));
383 383
 		break;
384 384
 	case 0xd:
385 385
 		poke16(d->dat, 0x6, file_stat(&d->mem[peek16(d->dat, 0xc)], peek16(d->dat, 0x4)));