[Wisp-cvs] wisp/src/native strings.nasm,1.52,1.53 wstrings.s,1.1,1.2 wstrings.wth,1.1,1.2

[<di...@us...>]

Update of /cvsroot/wisp/wisp/src/native
In directory usw-pr-cvs1:/tmp/cvs-serv27665/src/native

Modified Files:
	strings.nasm wstrings.s wstrings.wth 
Log Message:
Moved |<c16string>| and |c16string?| from strings.nasm to wstrings.wth .

Index: strings.nasm
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/strings.nasm,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- strings.nasm	7 Sep 2002 22:02:43 -0000	1.52
+++ strings.nasm	18 Sep 2002 21:00:08 -0000	1.53
@@ -463,16 +463,12 @@
 ;     jmp raise$2
 ; ; }}}
 
-rectype c16string
-    rt_slot_count 2
-    rt_ref NN_c16string_ref
-endrectype
-
 out_of_memory:
     push WB_out_of_memory
     push FALSE
     jmp raise$2
 
+extern RT_c16string
 extern RT_record_type
 extern WB_char8_huh
 extern WB_out_of_memory

Index: wstrings.s
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/wstrings.s,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wstrings.s	7 Sep 2002 22:02:43 -0000	1.1
+++ wstrings.s	18 Sep 2002 21:00:08 -0000	1.2
@@ -5,3 +5,20 @@
 .long discriminator_body - (.+4)
 .global N_c8string_huh,NN_c8string_huh
 .equiv NN_c8string_huh, N_c8string_huh + 1
+.section .text
+.align 16
+N_c16string_huh:
+.byte 144,186
+.long RT_c16string
+.byte 233
+.long discriminator_body - (.+4)
+.global N_c16string_huh,NN_c16string_huh
+.equiv NN_c16string_huh, N_c16string_huh + 1
+.section .text
+.align 16
+RT_c16string:
+.long RT_record_type
+.byte 1,0,0,0
+.long NN_c16string_huh
+.long NN_c16string_ref
+.global RT_c16string

Index: wstrings.wth
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/wstrings.wth,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wstrings.wth	7 Sep 2002 22:02:43 -0000	1.1
+++ wstrings.wth	18 Sep 2002 21:00:08 -0000	1.2
@@ -8,6 +8,12 @@
 
 (include wisptyp)
 
+(assemble RT_c16string
+  (tetra RT_record_type)
+  (tetra 1)
+  (tetra NN_c16string_huh)
+  (tetra NN_c16string_ref))
+
 (extern RT_c16string)
 (extern WB_range)
 (extern cons$2)
@@ -17,6 +23,9 @@
 (extern encui$1)
 (extern salloc$1)
 (extern ws2zt)
+
+(native c16string_huh
+  'RT_c16string go-discriminate)
 
 (macro decsi <: swap (flush) 'decsi$1 jump :>)
 (macro decui <: swap (flush) 'decui$1 jump :>)