Merge pull request #70 from orix-software/develop

Develop

Author: jedeoric

buildr128.sh

@@ -0,0 +1,24 @@
+#! /bin/bash
+#make
+NAME_TO_BUILD=full.128
+
+cat ../../empty-rom/empty-rom.rom  > $NAME_TO_BUILD
+cat ../../empty-rom/empty-rom.rom  >> $NAME_TO_BUILD
+cat ../../empty-rom/empty-rom.rom  >> $NAME_TO_BUILD
+cat ../../empty-rom/empty-rom.rom  >> $NAME_TO_BUILD
+
+
+cat ../../shell/develop/shellus.rom >> $NAME_TO_BUILD
+cat basicus2.rom >> $NAME_TO_BUILD
+cat kernelus.rom >> $NAME_TO_BUILD
+cat ../../empty-rom/empty-rom.rom  >> $NAME_TO_BUILD
+
+#cp $NAME_TO_BUILD /mnt/s/devus.r64
+
+
+#cat ../../shell/develop/shellus.rom >>initromD.all
+#cat basicus2.rom >> initromD.all
+#cat kernelud.rom >> initromD.all
+#cat ../../empty-rom/empty-rom.rom  >> initromD.all
+
+

buildr64.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 #make
-NAME_TO_BUILD=k2022-4.r64
+NAME_TO_BUILD=k2022-5.r64
 
 cp ../../shell/develop/shellus.rom $NAME_TO_BUILD
 cat basicus2.rom >> $NAME_TO_BUILD

docs/memmap_ram.md

@@ -102,16 +102,16 @@
 |RAM|Malloc table                   | $0525-$0575 |  80    |
 |RAM|main kernel process struct     | $0575-$058B |  22    |
 |RAM|BUFEDT                         | $0590-$05FE |   110   |
-|RAM|KERNEL_MEMORY_DRIVER           | $05FE-$06A4 |   166   |
+|RAM|KERNEL_MEMORY_DRIVER           | $05FE-$06A1 |   163   |
 # Kernel bank 7
 | Type      | Name                         | Range   | Size |
 | :-------- |:---------------------------- |:------- |:-----|
-|ROM|<span style="color:green">FREE</span>                         |$fbdc-$fff0|   1044   |
+|ROM|<span style="color:green">FREE</span>                         |$fbe0-$fff0|   1040   |
 #Bank 0
 | Type      | Name                         | Range   | Size |
 | :-------- |:---------------------------- |:------- |:-----|
 |BANK0|BUFBUF                        | $c080-$c0b6 |     |
 |BANK0|BUFROU                        | $c500-$c54e |     |
 |BANK0|TELEMON_KEYBOARD_BUFFER_BEGIN | $c5c4-$c680 |     |
-|BANK0|XMALLOC (copy from kernel)    | $f898-$f944 |     |
-|BANK0|X<span style="color:green">FREE</span> (copy from kernel)      | $f944-$fbc4 |     |
+|BANK0|XMALLOC (copy from kernel)    | $f89a-$f946 |     |
+|BANK0|X<span style="color:green">FREE</span> (copy from kernel)      | $f946-$fbc6 |     |

memmap.md

@@ -22,7 +22,7 @@ System will need almost 574 bytes in memory, if we reached KERNEL_MAX_PROCESS, K
 kernel_malloc_busy_begin : 2ba
 kernel_end_of_variables_before_BUFNOM : 503
 kernel_end_of_variables_before_BUFEDT : 58b
-kernel_end_of_memory_for_kernel (malloc will start at this adress) : 6a4
+kernel_end_of_memory_for_kernel (malloc will start at this adress) : 6a1
 |MODIFY:RES:_create_file_pointer
 |MODIFY:KERNEL_ERRNO:_create_file_pointer
 |CALL:XMALLOC:_create_file_pointer
@@ -207,16 +207,16 @@ CALL:XOPEN:XRM_ROUTINE
 |MEMMAP:RAM|Malloc table                   | $0525-$0575 |  80    |
 |MEMMAP:RAM|main kernel process struct     | $0575-$058B |  22    |
 |MEMMAP:RAM|BUFEDT                         | $0590-$05FE |   110   |
-|MEMMAP:RAM|KERNEL_MEMORY_DRIVER           | $05FE-$06A4 |   166   |
+|MEMMAP:RAM|KERNEL_MEMORY_DRIVER           | $05FE-$06A1 |   163   |
 |#MEMMAP: Kernel bank 7
 |MEMMAP: Type      | Name                         | Range   | Size |
 |MEMMAP: :-------- |:---------------------------- |:------- |:-----|
-|MEMMAP:ROM|FREE                         |$fbdc-$fff0|   1044   |
+|MEMMAP:ROM|FREE                         |$fbe0-$fff0|   1040   |
 |#MEMMAP:Bank 0
 |MEMMAP: Type      | Name                         | Range   | Size |
 |MEMMAP: :-------- |:---------------------------- |:------- |:-----|
 |MEMMAP:BANK0|BUFBUF                        | $c080-$c0b6 |     |
 |MEMMAP:BANK0|BUFROU                        | $c500-$c54e |     |
 |MEMMAP:BANK0|TELEMON_KEYBOARD_BUFFER_BEGIN | $c5c4-$c680 |     |
-|MEMMAP:BANK0|XMALLOC (copy from kernel)    | $f898-$f944 |     |
-|MEMMAP:BANK0|XFREE (copy from kernel)      | $f944-$fbc4 |     |
+|MEMMAP:BANK0|XMALLOC (copy from kernel)    | $f89a-$f946 |     |
+|MEMMAP:BANK0|XFREE (copy from kernel)      | $f946-$fbc6 |     |

run.sh

@@ -19,8 +19,8 @@ cl65 -ttelestrat -C  tests/orix-sdk/cfg/telestrat_900.cfg  tests/readdir.c tests
 ca65 --cpu 6502 -DWITH_SDCARD_FOR_ROOT=1 -DWITH_DEBUG=1  --verbose -s -ttelestrat  src/kdebug.asm -o kdebugsd.ld65 --debug-info
 ld65 -tnone -DWITH_SDCARD_FOR_ROOT=1 -DWITH_DEBUG=1  kdebugsd.ld65 -o kdebug.rom -Ln kdebugsd.sym -m memmap.txt -vm
 
-cp kernel.rom $ORICUTRON_PATH/roms 
-cp kdebug.rom $ORICUTRON_PATH/roms 
+cp kernel.rom $ORICUTRON_PATH/roms
+cp kdebug.rom $ORICUTRON_PATH/roms
 cp multi $ORICUTRON_PATH/sdcard/bin/a
 cp b $ORICUTRON_PATH/sdcard/bin/b
 cd $ORICUTRON_PATH

src/build.inc

@@ -1 +1 @@
-.define __DATE__ "2022-09-23 23:46"
+.define __DATE__ "2022-10-21 23:47"

src/functions/files/_update_fp_position.asm

@@ -26,57 +26,57 @@
 
   ldy     #_KERNEL_FILE::f_seek_file
 
-  lda     (KERNEL_XOPEN_PTR1),y
-
+  lda     (KERNEL_XOPEN_PTR1),y ; Get first byte
   clc
   adc     XOPEN_RES
+  sta     (KERNEL_XOPEN_PTR1),y  ; update byte 1 of the file position
   bcc     @no_inc_byte2
-  iny
-  clc
-  lda     #$01
-  adc     (KERNEL_XOPEN_PTR1),y
-  dey
+
+  ldy     #(_KERNEL_FILE::f_seek_file+1)
+  jsr     inc_byte_superior ; byte 2
+  bcc     @no_inc_byte2
+
+  ldy     #(_KERNEL_FILE::f_seek_file+2)
+  jsr     inc_byte_superior
+  bcc     @no_inc_byte2
+
+  ldy     #(_KERNEL_FILE::f_seek_file+3)
+  jsr     inc_byte_superior
+  bcc     @no_inc_byte2
+
+
 @no_inc_byte2:
-  sta     (KERNEL_XOPEN_PTR1),y
 
-  iny
+
+  ldy     #(_KERNEL_FILE::f_seek_file+1)
   lda     (KERNEL_XOPEN_PTR1),y
   adc     XOPEN_RES+1
+  sta     (KERNEL_XOPEN_PTR1),y  ; update byte 2 of the file position
   bcc     @no_inc_byte3
-  iny
-  clc
-  lda     #$01
-  adc     (KERNEL_XOPEN_PTR1),y
-  dey
-@no_inc_byte3:
 
-  sta     (KERNEL_XOPEN_PTR1),y
-
-  iny
-  lda     (KERNEL_XOPEN_PTR1),y
-  adc     #$00
 
-  bcc     @no_inc_byte4
-
-  iny
-  clc
-  lda     #$01
-  adc     (KERNEL_XOPEN_PTR1),y
-  dey
+  ldy     #(_KERNEL_FILE::f_seek_file+2)
+  jsr     inc_byte_superior ; Byte 3
+  bcc     @no_inc_byte3
 
-@no_inc_byte4:
-  sta     (KERNEL_XOPEN_PTR1),y
+  ldy     #(_KERNEL_FILE::f_seek_file+3)
+  jsr     inc_byte_superior ; byte 4
 
-  iny
-  lda     (KERNEL_XOPEN_PTR1),y
-  adc     #$00
+@no_inc_byte3:
 
-  ; restore A & X
 
   lda     XOPEN_RES
   ldx     XOPEN_RES+1
 
 
   rts
 
+inc_byte_superior:
+  clc
+  lda     #$01
+  adc     (KERNEL_XOPEN_PTR1),y
+  sta     (KERNEL_XOPEN_PTR1),y
+  rts
+
+
 .endproc

src/functions/files/xread.asm

@@ -89,6 +89,9 @@
 @loop:
   lda     CH376_DATA                ; read the data
   sta     (PTR_READ_DEST),y         ; send data in the ptr address
+.ifdef DEBUG_XREAD
+  ;sta     $7000,y                  ; send DEBUG
+.endif
   iny                               ; inc next ptr addrss
   cpy     TR0                       ; do we read enough bytes
   bne     @loop                     ; no we read

src/functions/memory/memory_driver.asm

@@ -1,7 +1,8 @@
 ; This routine check if IRQ vector is set to $fffe, if yes we continue or else, we proceed to next bank
 ; Also if $FFF7 contains 0, it means that there is no command, then we skip
 
-
+; At the beginning of this routine, we already swapped into the a bank to check
+; Bank and twilighte_banking_register are managed in the kernel and call this routines located in the main ram
 kernel_memory_driver_to_copy:
     lda     VIA2::PRA
     and     KERNEL_TMP_XEXEC               ; But select a bank in BNK_TO_SWITCH
@@ -23,17 +24,17 @@ test_debug:
     sta     RESB+1
 ; d15E
     ldx     #$00
-
 read_command_from_bank_driver_mloop:
     ldy     #$00
 read_command_from_bank_driver_next_char:
-    lda     (RES),y
-    cmp     (RESB),y         ; Same character?
+    lda     (RES),y          ; RES contains the ptr of the string typed by the user when XEXEC is launched
+    cmp     (RESB),y         ; Same character? RESB contains the ptr of the command in the rom
     beq     read_command_from_bank_driver_no_space
-    cmp     #' '             ; space?
+    cmp     #' '             ; Space?
     bne     command_not_found_no_inc
-    lda     (RESB),y        ; Last character of the command name?
-read_command_from_bank_driver_no_space:                   ; FIXME
+    lda     (RESB),y         ; Last character of the command name?
+
+read_command_from_bank_driver_no_space:
     cmp     #$00            ; Test end of command name or EOL
     beq     read_command_from_bank_driver_command_found
     iny
@@ -42,13 +43,20 @@ read_command_from_bank_driver_no_space:                   ; FIXME
 
 command_not_found:
     ; read_until_we_reached $00
+    ; this code is to detect the end of the string of the command tested
+    ; For example, if the command launch in RES is "bank" and RESB a ptr to is "ls" string in the current bank, we "iny"
+    ; the value in order to reach EOL of "ls". in that case, we add the length of "ls"+0 to the RESB ptr in order to read the next command
     iny
-command_not_found_no_inc:
 
+    ; Theses following lines are here to exit this routine, if we reach y=12, because it's impossible to have a command longer than 12 bytes.
+    cpy     #12
+    beq     exit_to_kernel
 
+command_not_found_no_inc:
     lda     (RESB),y
     beq     @add
     bne     command_not_found
+
 @add:
     iny
     tya
@@ -59,7 +67,7 @@ command_not_found_no_inc:
 read_command_from_bank_driver_do_not_inc:
     sta     RESB
     inx
-    cpx     $FFF7 ; Number of command
+    cpx     $FFF7 ; loop until we reach number of command of the rom
     bne     read_command_from_bank_driver_mloop
     ; at this step we did not found the command in the rom
 exit_to_kernel:
@@ -70,9 +78,8 @@ exit_to_kernel:
     ldy     #ENOENT  ; error
 
     rts
-read_command_from_bank_driver_command_found:
-
 
+read_command_from_bank_driver_command_found:
     ; X contains the id of the command to start
     lda     $FFF3
     sta     RES
@@ -90,28 +97,33 @@ read_command_from_bank_driver_patch1:
 read_command_from_bank_driver_patch2:
     sta     VEXBNK+2           ; Will store in read_command_from_bank_driver_to_patch
 
-    lda     VIA2::PRA
-    ora     #%00000111                     ; Return to telemon
-    sta     VIA2::PRA
+    lda     #$07              ; Return to telemon
+    jsr     $46a
+
+
     jsr     _XFORK
 
     ; we reached max process to launch ?
     lda     KERNEL_ERRNO
     cmp     #KERNEL_ERRNO_MAX_PROCESS_REACHED
     beq     exit_to_kernel                    ; Yes we reached max process we exit
 
-    lda     VIA2::PRA
-    and     KERNEL_TMP_XEXEC                  ; But select a bank in BNK_TO_SWITCH
-    sta     VIA2::PRA
+    lda     KERNEL_TMP_XEXEC
+    jsr     $46A
+
+
+
+    lda     TR0
+    ldy     TR1                               ; Send command line in A & Y
 
-	lda     TR0
-	ldy     TR1                               ; Send command line in A & Y
 read_command_from_bank_driver_to_patch:
     jsr     VEXBNK
     pha
-    lda     VIA2::PRA
-    ora     #%00000111                        ; Return to kernel
-    sta     VIA2::PRA
+
+    lda     #$07              ; Return to telemon
+    jsr     $46A
+
+
     pla
     ldy     #EOK