git-svn-id: http://svn.code.sf.net/p/netboot65/code@149 93682198-c243-4bdb-bd91-e943c89aac3b

client/ip65/arithmetic.s

@@ -27,6 +27,8 @@ temp_ax: .res 2
 .export cmp_32_32
 .export cmp_16_16
 
+.export mul_8_16
+
 ;compare 2 32bit numbers
 ;on exit, zero flag clear iff acc32==op32
 cmp_32_32:
@@ -116,3 +118,32 @@ add_16_32:
   sta (acc32),y
   rts
   
+;multiply a 16 bit number by an 8 bit number
+;acc16=acc16*a
+mul_8_16:
+  tax
+  beq @operand_is_zero
+  lda  acc16
+  sta  temp_ax
+  lda  acc16+1
+  sta  temp_ax+1
+  
+@addition_loop:
+  dex
+  beq @done
+  clc
+  lda acc16
+  adc temp_ax
+  sta acc16
+  lda acc16+1
+  adc temp_ax+1
+  sta acc16+1
+  jmp @addition_loop  
+  
+@done:
+
+  rts  
+@operand_is_zero:
+  sta acc16
+  sta acc16+1  
+  rts

client/test/rob_gopher.txt

@@ -7,7 +7,7 @@ i                                   |__/                  		error.host	1
 i                                                     .com		error.host	1
 i 		error.host	1
 iServer Info		error.host	1
-0About this server	/serverinfo.txt	robsayers.com	70
+0About this server	/serverinfo.txt	robsayers.com	7070
 7Search This Server (experiemental)	/localsearch	robsayers.com	70
 0Server Update	/uptime.sh	robsayers.com	70
 0Tail of server log	/log.sh	robsayers.com	70

client/test/test_gopher.s

@@ -2,6 +2,7 @@
   .include "../inc/commonprint.i"
   .include "../inc/net.i"
   .include "../inc/char_conv.i"
+  .include "../inc/c64keycodes.i"
 
   .import get_key
   .import  __CODE_LOAD__
@@ -9,6 +10,16 @@
   .import  __RODATA_SIZE__
   .import  __DATA_SIZE__
 
+  .import mul_8_16
+  .importzp acc16
+
+
+.segment "IP65ZP" : zeropage
+
+; pointer for moving through buffers
+buffer_ptr:	.res 2			; source pointer
+
+
 .segment "STARTUP"    ;this is what gets put at the start of the file on the C64
 
 	.word basicstub		; load address
@@ -43,8 +54,9 @@ get_next_byte:
 
 .bss 
 
+DISPLAY_LINES=20
 page_counter: .res 1
-MAX_PAGES = 10
+MAX_PAGES = 50
 page_pointer_lo: .res MAX_PAGES
 page_pointer_hi: .res MAX_PAGES
 
@@ -57,11 +69,24 @@ resource_type: .res MAX_RESOURCES
 
 this_is_last_page: .res 1
 
+resource_hostname: .res 128
+resource_port: .res 2
+resource_selector: .res 256
+
+temp_ax: .res 2
+
 .code
 
 init:
   
-  jsr  show_buffer
+  lda #14
+  jsr print_a ;switch to lower case
+
+  ldax #initial_location
+  sta resource_pointer_lo
+  stx resource_pointer_hi
+  ldx #0
+  jsr  show_resource
   rts
 
 show_buffer:
@@ -70,25 +95,39 @@ show_buffer:
   stax  get_next_byte+1
   
   lda #0
-  sta resource_counter
+  sta page_counter
-  
+ 
-  lda #14
-  jsr print_a ;switch to lower case
-
 @do_one_page:  
+  lda #147  ; 'CLR/HOME'
+  jsr print_a
 
+  ldax  #page_header
+  jsr print
+  lda page_counter
+  jsr print_hex
+  ldax #port_no
+  jsr print
+  lda resource_port+1
+  jsr print_hex
+  lda resource_port
+  jsr print_hex  
+  jsr print_cr
+  ldax #resource_hostname
+  jsr print
+  ldax #resource_selector
+  jsr print
+  
+  jsr print_cr
   ldx page_counter
   lda get_next_byte+1
-  sta page_pointer_lo  
+  sta page_pointer_lo,x
   lda get_next_byte+2
-  sta page_pointer_hi
+  sta page_pointer_hi,x
   inc page_counter
   
   lda #0
   sta resource_counter
 
-  lda #147  ; 'CLR/HOME'
-  jsr print_a
 
 @next_line:
   jsr get_next_byte
@@ -110,9 +149,12 @@ show_buffer:
 @standard_resource:  
   ldx resource_counter
   sta resource_type,x
+  sec  
   lda get_next_byte+1
+  sbc #1  ;since "get_next_byte" did the inc, we need to backtrack 1 byte
   sta resource_pointer_lo,x
   lda get_next_byte+2
+  sbc #0  ;in case there was an overflow on the low byte
   sta resource_pointer_hi,x
   inc resource_counter
   lda $d3
@@ -151,22 +193,178 @@ show_buffer:
   jsr print_cr
 :  
   lda $d6
-  cmp #23
+  cmp #DISPLAY_LINES
   bmi @next_line
   lda #0
   sta this_is_last_page
 @done:
-
+@get_keypress:
   jsr get_key
+  cmp #' '
+  beq @go_next_page  
+  cmp #KEYCODE_F7
+  beq @go_next_page
+  cmp #KEYCODE_DOWN
+  beq @go_next_page
+  cmp #KEYCODE_F1
+  beq @go_prev_page
+  cmp #KEYCODE_UP
+  beq @go_prev_page
+  cmp #KEYCODE_ABORT
   
+  beq @quit
+  ;if fallen through we don't know what the keypress means, go get another one
+  and #$7f  ;turn off the high bit 
+  sec
+  sbc #$40
+  bmi @not_a_resource
+  cmp resource_counter
+  beq @valid_resource
+  bcs @not_a_resource  
+@valid_resource:  
+  tax
+  dex
+  jsr show_resource
+@not_a_resource:  
+  jsr print_hex
+  jmp @get_keypress  
+@go_next_page:  
   lda this_is_last_page
-  bne @last_page
+  bne @get_keypress
+
   jmp @do_one_page
-@last_page:  
+@quit:
   rts
+@go_prev_page:  
+  ldx page_counter  
+  dex  
+  bne @not_first_page
+  jmp @get_keypress
+@not_first_page:  
+  dex
+  dec page_counter
+  dec page_counter
+  
+  lda page_pointer_lo,x  
+  sta get_next_byte+1
+  lda page_pointer_hi,x
+  sta get_next_byte+2
+  jmp @do_one_page
+
+;get a gopher resource 
+;X should be the selected resource number
+;the resources selected should be loaded into resource_pointer_* 
+
+show_resource:
+  lda resource_pointer_lo,x
+  sta buffer_ptr
+  lda resource_pointer_hi,x
+  sta buffer_ptr+1
+  ldy #0  
+  ldx #0
+  jsr @skip_to_next_tab
+;should now be pointing at the tab just before the selector
+@copy_selector:
+  iny 
+  lda (buffer_ptr),y
+  cmp #09
+  beq @end_of_selector
+  sta resource_selector,x
+  inx
+  jmp @copy_selector
+@end_of_selector:  
+  lda  #$00
+  sta resource_selector,x
+  tax
+;should now be pointing at the tab just before the hostname
+@copy_hostname:
+  iny 
+  lda (buffer_ptr),y
+  cmp #09
+  beq @end_of_hostname
+  sta resource_hostname,x
+  inx
+  jmp @copy_hostname
+
+@end_of_hostname:  
+  lda  #$00
+  sta resource_hostname,x
+
+;should now be pointing at the tab just before the port number
+  lda #0
+  sta resource_port
+  sta resource_port+1
+@parse_port:  
+  iny  
+  beq @end_of_port
+  lda (buffer_ptr),y
+  cmp #$0D
+  beq @end_of_port
+
+  ldax  resource_port
+  stax  acc16
+  lda #10
+  jsr mul_8_16
+  ldax  acc16
+  stax  resource_port
+  lda (buffer_ptr),y
+  sec
+  sbc #'0'
+  clc
+  adc resource_port
+  sta resource_port
+  bcc :+  
+  inc resource_port+1
+:  
+  jmp @parse_port  
+@end_of_port:  
+@done:  
+  jmp show_buffer
+  
+@skip_to_next_tab:  
+  iny
+  beq @done_skipping_over_tab 
+  lda (buffer_ptr),y
+  cmp #$09
+  bne @skip_to_next_tab
+@done_skipping_over_tab:  
+  rts
+
+;assumes acc16& A already set
+test_mul_8_16:
+  sta  temp_ax
+  lda acc16+1
+  jsr print_hex
+  lda acc16
+  jsr print_hex
+  
+  lda #'*'
+  jsr print_a
+  lda temp_ax
+  jsr print_hex
+    
+  lda #'='
+  jsr print_a
+  lda  temp_ax
+  jsr mul_8_16
+  lda acc16+1
+  jsr print_hex
+  lda acc16
+  jsr print_hex
+  jsr print_cr
+  rts
+
+
 
 .rodata
 input_buffer:
 .incbin "rob_gopher.txt"
 .incbin "retro_gopher.txt"
-.byte 0
+.byte 0
+page_header:
+.byte "PAGE NO $",0
+port_no:
+.byte "PORT NO ",0
+
+initial_location:
+.byte "1luddite",$09,"/luddite/",$09,"retro-net.org",$09,"70",$0D,$0A,0