[Wisp-cvs] wisp/src/native vectors.s,NONE,1.1 vectors.wth,NONE,1.1 Makefile.am,1.157,1.158 base.inc,
Status: Alpha
Brought to you by:
digg
Menu
▾
▴
[Wisp-cvs] wisp/src/native vectors.s,NONE,1.1 vectors.wth,NONE,1.1 Makefile.am,1.157,1.158 base.inc,1.97,1.98 death.s,1.2,1.3 misc.s,1.8,1.9 misc.wth,1.8,1.9 ref.nasm,1.10,1.11 sys.s,1.12,1.13 sys.wth,1.13,1.14 types.nasm,1.8,1.9 vectors.nasm,1.13,NONE
Update of /cvsroot/wisp/wisp/src/native
In directory usw-pr-cvs1:/tmp/cvs-serv703/src/native
Modified Files:
Makefile.am base.inc death.s misc.s misc.wth ref.nasm sys.s
sys.wth types.nasm
Added Files:
vectors.s vectors.wth
Removed Files:
vectors.nasm
Log Message:
Dropped NC_VECTOR in favour of the new |<vector>| type, thereby reducing the allocation block count of vectors from 2 to 1.
--- NEW FILE: vectors.s ---
.section .text
.align 16
N_vector_move:
.byte 144,81,131,249,5,15,132,8,0,0,0,88,137,193,233
.long N_signal_argcount - (.+4)
.byte 88,88,91,80,104
.long N_vector_move.L1
.byte 83,233
.long decui$1 - (.+4)
.byte 91,80,104
.long N_vector_move.L2
.byte 83,233
.long decui$1 - (.+4)
.byte 80,184,3,0,0,0,139,28,132,104
.long N_vector_move.L3
.byte 83,233
.long decui$1 - (.+4)
.byte 187,3,0,0,0,137,4,156,184,4,0,0,0,139,28,132,137,216,37,3,0,0,0,83
.byte 83,133,192,15,132,8,0,0,0,88,106,19,233,22,0,0,0,88,80,133,192,15
.byte 133,8,0,0,0,88,106,19,233,4,0,0,0,88,139,0,80,88,61
.long RT_vector
.byte 15,132,12,0,0,0,88,104
.long WB_vector_huh
.byte 80,233
.long raise$2 - (.+4)
.byte 88,184,2,0,0,0,139,28,132,137,216,37,3,0,0,0,83,83,133,192,15,132
.byte 8,0,0,0,88,106,19,233,22,0,0,0,88,80,133,192,15,133,8,0,0,0,88,106
.byte 19,233,4,0,0,0,88,139,0,80,88,61
.long RT_vector
.byte 15,132,12,0,0,0,88,104
.long WB_vector_huh
.byte 80,233
.long raise$2 - (.+4)
.byte 88,184,3,0,0,0,139,28,132,83,184,5,0,0,0,139,28,132,131,195,4,139
.byte 27,88,80,83,57,216,15,134,24,0,0,0,88,88,104
.long N_vector_move.L15
.byte 80,233
.long encui$1 - (.+4)
.byte 104
.long WB_range
.byte 80,233
.long raise$2 - (.+4)
.byte 88,91,89,1,203,81,57,195,15,134,23,0,0,0,88,104
.long N_vector_move.L17
.byte 80,233
.long encui$1 - (.+4)
.byte 104
.long WB_range
.byte 80,233
.long raise$2 - (.+4)
.byte 184,1,0,0,0,139,28,132,83,184,3,0,0,0,139,28,132,131,195,4,139,27
.byte 88,80,83,57,216,15,134,24,0,0,0,88,88,104
.long N_vector_move.L19
.byte 80,233
.long encui$1 - (.+4)
.byte 104
.long WB_range
.byte 80,233
.long raise$2 - (.+4)
.byte 88,91,89,1,203,81,57,195,15,134,23,0,0,0,88,104
.long N_vector_move.L21
.byte 80,233
.long encui$1 - (.+4)
.byte 104
.long WB_range
.byte 80,233
.long raise$2 - (.+4)
.byte 88,91,89,193,227,2,131,193,8,1,203,89,95,193,225,2,131,199,8,1,249
.byte 137,207,137,193,137,222,252,243,165,184,27,0,0,0,195
.global N_vector_move,NN_vector_move,N_vector_move.L1,N_vector_move.L2,N_vector_move.L3,N_vector_move.L15,N_vector_move.L17,N_vector_move.L19,N_vector_move.L21
.equiv NN_vector_move, N_vector_move + 1
.equiv N_vector_move.L1, N_vector_move + 34
.equiv N_vector_move.L2, N_vector_move + 47
.equiv N_vector_move.L3, N_vector_move + 67
.equiv N_vector_move.L15, N_vector_move + 281
.equiv N_vector_move.L17, N_vector_move + 318
.equiv N_vector_move.L19, N_vector_move + 375
.equiv N_vector_move.L21, N_vector_move + 412
.section .text
.align 16
N_make_vector:
.byte 144,81,131,249,1,15,133,5,0,0,0,88,64,106,19,80,88,80,61,2,0,0,0
.byte 15,132,8,0,0,0,88,137,193,233
.long N_signal_argcount - (.+4)
.byte 88,88,91,80,83,104
.long N_make_vector.L2
.byte 83,233
.long decui$1 - (.+4)
.byte 80,61,0,0,0,192,15,130,13,0,0,0,88,88,104
.long WB_out_of_memory
.byte 80,233
.long raise$2 - (.+4)
.byte 88,91,137,195,131,195,2,80,104
.long N_make_vector.L4
.byte 83,233
.long valloc$1 - (.+4)
.byte 199,0
.long RT_vector
.byte 91,137,193,131,193,4,137,25,91,185,2,0,0,0,80,104
.long N_make_vector.L5
.byte 80,83,233
.long N_vector_fill - (.+4)
.byte 88,195
.global N_make_vector,NN_make_vector,N_make_vector.L2,N_make_vector.L4,N_make_vector.L5
.equiv NN_make_vector, N_make_vector + 1
.equiv N_make_vector.L2, N_make_vector + 53
.equiv N_make_vector.L4, N_make_vector + 97
.equiv N_make_vector.L5, N_make_vector + 130
.section .text
.align 16
N_vector_fill:
.byte 144,81,131,249,2,15,132,8,0,0,0,88,137,193,233
.long N_signal_argcount - (.+4)
.byte 88,88,91,137,217,131,225,3,80,83,83,133,201,15,132,8,0,0,0,88,106
.byte 19,233,22,0,0,0,88,80,133,192,15,133,8,0,0,0,88,106,19,233,4,0,0,0
.byte 88,139,0,80,88,61
.long RT_vector
.byte 15,132,12,0,0,0,88,104
.long WB_vector_huh
.byte 80,233
.long raise$2 - (.+4)
.byte 88,137,195,131,195,8,5,4,0,0,0,139,0,89,137,199,137,200,137,249
.byte 137,223,252,243,171,184,27,0,0,0,195
.global N_vector_fill,NN_vector_fill
.equiv NN_vector_fill, N_vector_fill + 1
.section .text
.align 16
N_vector_ref:
.byte 144,81,131,249,2,15,133,162,0,0,0,88,88,80,104
.long N_vector_ref.L1
.byte 80,233
.long decsi$1 - (.+4)
.byte 91,89,137,207,131,231,3,83,80,81,81,133,255,15,132,8,0,0,0,88,106
.byte 19,233,22,0,0,0,88,80,133,192,15,133,8,0,0,0,88,106,19,233,4,0,0,0
.byte 88,139,0,80,88,61
.long RT_vector
.byte 15,132,12,0,0,0,88,104
.long WB_vector_huh
.byte 80,233
.long raise$2 - (.+4)
.byte 88,137,195,131,195,8,5,4,0,0,0,139,0,89,83,80,81,133,201,15,141,6
.byte 0,0,0,88,91,1,216,83,80,88,91,83,80,57,216,15,130,15,0,0,0,88,88
.byte 88,88,104
.long WB_range
.byte 80,233
.long raise$2 - (.+4)
.byte 88,91,91,89,193,224,2,1,195,139,27,83,233,184,0,0,0,88,80,61,253
.byte 255,255,255,15,132,8,0,0,0,88,137,193,233
.long N_signal_argcount - (.+4)
.byte 88,88,91,89,80,81,83,104
.long N_vector_ref.L11
.byte 83,233
.long decsi$1 - (.+4)
.byte 91,89,137,207,131,231,3,83,80,81,81,133,255,15,132,8,0,0,0,88,106
.byte 19,233,22,0,0,0,88,80,133,192,15,133,8,0,0,0,88,106,19,233,4,0,0,0
.byte 88,139,0,80,88,61
.long RT_vector
.byte 15,132,12,0,0,0,88,104
.long WB_vector_huh
.byte 80,233
.long raise$2 - (.+4)
.byte 88,137,195,131,195,8,5,4,0,0,0,139,0,89,83,80,81,133,201,15,141,6
.byte 0,0,0,88,91,1,216,83,80,88,91,83,80,57,216,15,130,15,0,0,0,88,88
.byte 88,88,104
.long WB_range
.byte 80,233
.long raise$2 - (.+4)
.byte 88,91,91,89,193,224,2,1,195,88,137,3,106,27,88,195
.global N_vector_ref,NN_vector_ref,N_vector_ref.L1,N_vector_ref.L11
.equiv NN_vector_ref, N_vector_ref + 1
.equiv N_vector_ref.L1, N_vector_ref + 25
.equiv N_vector_ref.L11, N_vector_ref + 212
.section .text
.align 16
N_vector_length:
.byte 144,81,131,249,1,15,132,8,0,0,0,88,137,193,233
.long N_signal_argcount - (.+4)
.byte 88,88,137,195,131,227,3,80,80,133,219,15,132,8,0,0,0,88,106,19,233
.byte 22,0,0,0,88,80,133,192,15,133,8,0,0,0,88,106,19,233,4,0,0,0,88,139
.byte 0,80,88,61
.long RT_vector
.byte 15,132,12,0,0,0,88,104
.long WB_vector_huh
.byte 80,233
.long raise$2 - (.+4)
.byte 88,5,4,0,0,0,139,0,80,233
.long encui$1 - (.+4)
.global N_vector_length,NN_vector_length
.equiv NN_vector_length, N_vector_length + 1
.section .text
.align 16
N_vector_huh:
.byte 144,186
.long RT_vector
.byte 233
.long discriminator_body - (.+4)
.global N_vector_huh,NN_vector_huh
.equiv NN_vector_huh, N_vector_huh + 1
.section .text
.align 16
RT_vector:
.long RT_record_type
.byte 1,0,0,0
.long NN_vector_huh
.long NN_vector_ref
.long NN_vector_length
.long NN_make_vector
.byte 19,0,0,0,19,0,0,0
.global RT_vector
--- NEW FILE: vectors.wth ---
;;;; vectors.wth - generic vectors
;;
;; Copyleft © 2002 by Andres Soolo (di...@us...)
;; This file is licensed under the GNU GPL v2. If you
;; don't know what that means, please do read the GPL.
;;
;;;; @(#) $Id: vectors.wth,v 1.1 2002/09/18 21:12:38 digg Exp $
(include wisptyp)
(extern WB_out_of_memory)
(extern WB_range)
(extern WB_vector_huh)
(extern decsi$1)
(extern decui$1)
(extern encsi$1)
(extern encui$1)
(extern valloc$1)
(macro decsi <: swap (flush) 'decsi$1 jump :>)
(macro decui <: swap (flush) 'decui$1 jump :>)
(macro encsi <: swap (flush) 'encsi$1 jump :>)
(macro encui <: swap (flush) 'encui$1 jump :>)
(macro valloc <: swap (flush) 'valloc$1 jump :>)
(extern RT_vector)
(assemble RT_vector
(tetra RT_record_type)
(tetra 1)
(tetra NN_vector_huh)
(tetra NN_vector_ref)
(tetra NN_vector_length)
(tetra NN_make_vector)
(tetra 19) ; FALSE
(tetra 19)) ; FALSE
(native vector_huh
'RT_vector go-discriminate)
(native vector_length dup 1 = argc drop
require-vector vector-length (flush) 'encui$1 jump)
(native vector_ref
dup 2 = if
drop dup decsi rot ; (nindex index vec)
require-vector dup vector-data swap vector-length
rot ; (nindex vecdata veclen index)
dup 0 < if over + then
2dup swap u>= if ; catches negative indices too
drop drop drop 'WB_range swap go-raise
then
nip rot drop cells + cell@
else
dup -3 = argc drop ; (vec nindex obj)
-rot dup decsi rot ; (obj nindex index vec)
require-vector dup vector-data swap vector-length
rot ; (obj nindex vecdata veclen index)
dup 0 < if over + then
2dup swap u>= if ; catches negative indices too
drop drop drop 'WB_range swap go-raise
then
nip rot drop cells + cell! VOID
then)
(native vector_fill dup 2 = argc drop
swap require-vector dup vector-data swap vector-length rot cellfill
VOID)
(native make_vector dup 1 = if FALSE swap 1+ then dup 2 = argc drop
; (nlength object)
swap dup decui ; (object nlength length)
dup #xC0000000 u>= if
drop 'WB_out_of_memory swap go-raise
then nip dup 2 + valloc ; (object length body node)
'RT_vector over cell! ; store type
tuck 1 cells + cell! ; store length
tuck swap ; (node node object)
<: -rot 2 (conform %ecx) 'N_vector_fill jump :> (believe %eax)
drop)
(native vector_move dup 5 = argc drop
swap decui swap decui 3 dig decui 3 bury
4 dig require-vector drop 2 dig require-vector drop
; (dest destind src srcind amount)
3 dig 5 dig vector-length
2dup u> if drop encui 'WB_range swap go-raise then
-rot over + rot u> if encui 'WB_range swap go-raise then
; (dest destind src srcind amount)
1 dig 3 dig vector-length
2dup u> if drop encui 'WB_range swap go-raise then
-rot over + rot u> if encui 'WB_range swap go-raise then
-rot cells swap vector-data + 2swap cells swap vector-data +
rot tetramove VOID)
; vim: ft=worth
Index: Makefile.am
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/Makefile.am,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- Makefile.am 18 Sep 2002 21:08:01 -0000 1.157
+++ Makefile.am 18 Sep 2002 21:12:38 -0000 1.158
@@ -14,9 +14,9 @@
base.inc \
apply.nasm chars.nasm cxr.nasm integers.nasm list.nasm \
memset.nasm records.nasm ref.nasm resignal.nasm signal.nasm \
- strings.nasm types.nasm valloc.nasm vectors.nasm wrap.nasm \
- boxes.wth cons.wth death.wth misc.wth sys.wth wstrings.wth \
- boxes.s cons.s death.s misc.s sys.s wstrings.s
+ strings.nasm types.nasm valloc.nasm wrap.nasm \
+ boxes.wth cons.wth death.wth misc.wth sys.wth vectors.wth wstrings.wth \
+ boxes.s cons.s death.s misc.s sys.s vectors.s wstrings.s
EXTRA_DIST = .cvsignore
@@ -24,8 +24,7 @@
libnative_a_LIBADD = native_call.o branches.o \
apply.o chars.o cxr.o integers.o list.o memset.o records.o ref.o \
- resignal.o signal.o strings.o sys.o types.o valloc.o vectors.o \
- wrap.o
+ resignal.o signal.o strings.o sys.o types.o valloc.o wrap.o
%.o: %.nasm base.inc
nasm -w+orphan-labels -d@SYSTYPE@ -d@CPUTYPE@ -f elf -i $(srcdir)/ -l $*.prn -o $@ $<
Index: base.inc
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/base.inc,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- base.inc 18 Sep 2002 21:03:13 -0000 1.97
+++ base.inc 18 Sep 2002 21:12:38 -0000 1.98
@@ -160,15 +160,6 @@
jnz near _signal_c16string_%1
%endmacro
-%macro req_vector 0-1 eax
- test %1.low.low, 3
- jnz near _signal_vector_%1
- test %1, %1
- jz near _signal_vector_%1
- cmp type(%1), NC_VECTOR
- jnz near _signal_vector_%1
-%endmacro
-
%macro req_char 0-1 eax
cmp %1.low.low, 3
jnz near _signal_char_%1
@@ -492,7 +483,6 @@
%define NC_EVMFUNC 3
%define NC_DICT 5
%define NC_SYMBOL 6
-%define NC_VECTOR 8
%define NC_C8STRING 9
%define NC_INSTANCE 10
Index: death.s
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/death.s,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- death.s 7 Sep 2002 22:03:56 -0000 1.2
+++ death.s 18 Sep 2002 21:12:38 -0000 1.3
@@ -3,10 +3,10 @@
die:
.byte 88,232
.long strlen - (.+4)
-.byte 186,13,0,0,0,185
+.byte 80,186,13,0,0,0,185
.long _death.wth_G0_
-.byte 187,1,0,0,0,137,199,184,4,0,0,0,205,128,88,137,250,137,193,187,1,0
-.byte 0,0,184,4,0,0,0,205,128,186,1,0,0,0,185
+.byte 187,1,0,0,0,184,4,0,0,0,205,128,88,91,137,194,137,217,187,1,0,0,0
+.byte 184,4,0,0,0,205,128,186,1,0,0,0,185
.long _death.wth_G1_
.byte 187,1,0,0,0,184,4,0,0,0,205,128,187,1,0,0,0,184,1,0,0,0,205,128
.global die
Index: misc.s
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/misc.s,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- misc.s 18 Sep 2002 21:10:03 -0000 1.8
+++ misc.s 18 Sep 2002 21:12:38 -0000 1.9
@@ -30,81 +30,6 @@
.global immediate_return
.section .text
.align 16
-N_vector_fill:
-.byte 144,81,131,249,2,15,132,8,0,0,0,88,137,193,233
-.long N_signal_argcount - (.+4)
-.byte 88,88,91,137,217,131,193,8,139,9,131,195,4,139,27,137,207,137,217
-.byte 252,243,171,184,27,0,0,0,195
-.global N_vector_fill,NN_vector_fill
-.equiv NN_vector_fill, N_vector_fill + 1
-.section .text
-.align 16
-N_vector_ref:
-.byte 144,81,131,249,2,15,133,187,0,0,0,88,88,80,104
-.long N_vector_ref.L1
-.byte 80,233
-.long decsi$1 - (.+4)
-.byte 91,89,137,207,131,231,3,83,80,81,81,133,255,15,132,8,0,0,0,88,106
-.byte 19,233,22,0,0,0,88,80,133,192,15,133,8,0,0,0,88,106,19,233,4,0,0,0
-.byte 88,139,0,80,88,61,8,0,0,0,15,132,12,0,0,0,88,104
-.long WB_vector_huh
-.byte 80,233
-.long raise$2 - (.+4)
-.byte 88,137,195,131,195,8,139,27,5,4,0,0,0,139,0,89,83,80,81,133,201,15
-.byte 141,29,0,0,0,88,91,1,216,83,80,133,192,15,141,15,0,0,0,88,88,88,88
-.byte 104
-.long WB_range
-.byte 80,233
-.long raise$2 - (.+4)
-.byte 88,91,83,80,57,216,15,140,15,0,0,0,88,88,88,88,104
-.long WB_range
-.byte 80,233
-.long raise$2 - (.+4)
-.byte 88,91,91,89,193,224,2,1,195,139,27,83,233,209,0,0,0,88,80,61,253
-.byte 255,255,255,15,132,8,0,0,0,88,137,193,233
-.long N_signal_argcount - (.+4)
-.byte 88,88,91,89,80,81,83,104
-.long N_vector_ref.L12
-.byte 83,233
-.long decsi$1 - (.+4)
-.byte 91,89,137,207,131,231,3,83,80,81,81,133,255,15,132,8,0,0,0,88,106
-.byte 19,233,22,0,0,0,88,80,133,192,15,133,8,0,0,0,88,106,19,233,4,0,0,0
-.byte 88,139,0,80,88,61,8,0,0,0,15,132,12,0,0,0,88,104
-.long WB_vector_huh
-.byte 80,233
-.long raise$2 - (.+4)
-.byte 88,137,195,131,195,8,139,27,5,4,0,0,0,139,0,89,83,80,81,133,201,15
-.byte 141,29,0,0,0,88,91,1,216,83,80,133,192,15,141,15,0,0,0,88,88,88,88
-.byte 104
-.long WB_range
-.byte 80,233
-.long raise$2 - (.+4)
-.byte 88,91,83,80,57,216,15,140,15,0,0,0,88,88,88,88,104
-.long WB_range
-.byte 80,233
-.long raise$2 - (.+4)
-.byte 88,91,91,89,193,224,2,1,195,88,137,3,106,27,88,195
-.global N_vector_ref,NN_vector_ref,N_vector_ref.L1,N_vector_ref.L12
-.equiv NN_vector_ref, N_vector_ref + 1
-.equiv N_vector_ref.L1, N_vector_ref + 25
-.equiv N_vector_ref.L12, N_vector_ref + 237
-.section .text
-.align 16
-N_vector_length:
-.byte 144,81,131,249,1,15,132,8,0,0,0,88,137,193,233
-.long N_signal_argcount - (.+4)
-.byte 88,88,137,195,131,227,3,80,80,133,219,15,132,8,0,0,0,88,106,19,233
-.byte 22,0,0,0,88,80,133,192,15,133,8,0,0,0,88,106,19,233,4,0,0,0,88,139
-.byte 0,80,88,61,8,0,0,0,15,132,12,0,0,0,88,104
-.long WB_vector_huh
-.byte 80,233
-.long raise$2 - (.+4)
-.byte 88,5,4,0,0,0,139,0,80,233
-.long encui$1 - (.+4)
-.global N_vector_length,NN_vector_length
-.equiv NN_vector_length, N_vector_length + 1
-.section .text
-.align 16
N_record_type_length:
.byte 144,81,131,249,1,15,132,8,0,0,0,88,137,193,233
.long N_signal_argcount - (.+4)
@@ -166,13 +91,6 @@
.long slot_accessor_body - (.+4)
.global N_pr_record_type_ref_slot,NN_pr_record_type_ref_slot
.equiv NN_pr_record_type_ref_slot, N_pr_record_type_ref_slot + 1
-.section .text
-.align 16
-N_vector_huh:
-.byte 144,186,8,0,0,0,233
-.long discriminator_body - (.+4)
-.global N_vector_huh,NN_vector_huh
-.equiv NN_vector_huh, N_vector_huh + 1
.section .text
.align 16
N_record_type_huh:
Index: misc.wth
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/misc.wth,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- misc.wth 18 Sep 2002 21:10:03 -0000 1.8
+++ misc.wth 18 Sep 2002 21:12:38 -0000 1.9
@@ -10,20 +10,25 @@
(extern RT_record_type)
(extern WB_creatable_huh)
+(extern WB_out_of_memory)
(extern WB_range)
(extern WB_record_type_huh)
-(extern WB_vector_huh)
(extern decsi$1)
(extern decui$1)
(extern encsi$1)
(extern encui$1)
(extern funcall)
(extern rvec)
+(extern valloc$1)
(macro RVEC_LEN 30)
(macro decsi <: swap (flush) 'decsi$1 jump :>)
(macro decui <: swap (flush) 'decui$1 jump :>)
+(macro encsi <: swap (flush) 'encsi$1 jump :>)
+(macro encui <: swap (flush) 'encui$1 jump :>)
+(macro valloc <: swap (flush) 'valloc$1 jump :>)
+
(macro rdecui ; ( node limit )
over decui swap over swap
>= if drop 'WB_range swap go-raise then nip)
@@ -44,9 +49,6 @@
(native record_type_huh
'RT_record_type go-discriminate)
-(native vector_huh
- NC_VECTOR go-discriminate)
-
; FOR INTERNAL USE BY |make-record-type| ONLY!
; It is an important guarantee that it's safe to share
; record-type:s without need to fear undue influence.
@@ -72,44 +74,6 @@
else
'WB_record_type_huh swap go-raise
then)
-
-(native vector_length dup 1 = argc drop
- require-vector vector-length (flush) 'encui$1 jump)
-
-(native vector_ref
- dup 2 = if
- drop dup decsi rot ; (nindex index vec)
- require-vector dup vector-data swap vector-length
- rot ; (nindex vecdata veclen index)
- dup 0 < if
- over +
- dup 0 < if
- drop drop drop 'WB_range swap go-raise
- then
- then
- 2dup swap >= if
- drop drop drop 'WB_range swap go-raise
- then
- nip rot drop cells + cell@
- else
- dup -3 = argc drop ; (vec nindex obj)
- -rot dup decsi rot ; (obj nindex index vec)
- require-vector dup vector-data swap vector-length
- rot ; (obj nindex vecdata veclen index)
- dup 0 < if
- over +
- dup 0 < if
- drop drop drop 'WB_range swap go-raise
- then
- then
- 2dup swap >= if
- drop drop drop 'WB_range swap go-raise
- then
- nip rot drop cells + cell! VOID
- then)
-
-(native vector_fill dup 2 = argc drop
- swap dup vector-data swap vector-length rot tetrafill VOID)
(extern immediate_return)
(assemble immediate_return
Index: ref.nasm
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/ref.nasm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ref.nasm 26 Aug 2002 16:18:24 -0000 1.10
+++ ref.nasm 18 Sep 2002 21:12:38 -0000 1.11
@@ -23,8 +23,6 @@
mov edx, type(eax)
cmp edx, NC_C8STRING
jz near N_c8string_ref ; tail call
- cmp edx, NC_VECTOR
- jz near N_vector_ref ; tail call
cmp edx, byte 15 ; if larger, assume record type pointer
jbe .not_a_compound
mov edx, record_type#ref(edx)
Index: sys.s
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/sys.s,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sys.s 18 Sep 2002 21:08:01 -0000 1.12
+++ sys.s 18 Sep 2002 21:12:38 -0000 1.13
@@ -8,24 +8,26 @@
.byte 91,91,89,137,231,80,81,83,137,248,45,8,0,0,0,139,0,137,195,131,227
.byte 3,106,0,87,80,80,133,219,15,132,8,0,0,0,88,106,19,233,22,0,0,0,88
.byte 80,133,192,15,133,8,0,0,0,88,106,19,233,4,0,0,0,88,139,0,80,88,61
-.byte 8,0,0,0,15,132,12,0,0,0,88,104
+.long RT_vector
+.byte 15,132,12,0,0,0,88,104
.long WB_vector_huh
.byte 80,233
.long raise$2 - (.+4)
-.byte 88,137,195,131,195,4,139,27,5,8,0,0,0,139,0,137,217,193,225,2,1
-.byte 200,83,80,88,91,83,80,133,219,15,142,33,0,0,0,88,91,75,45,4,0,0,0
-.byte 137,193,139,9,83,80,81,232
+.byte 88,137,195,131,195,4,139,27,5,8,0,0,0,137,217,193,225,2,1,200,83
+.byte 80,88,91,83,80,133,219,15,142,33,0,0,0,88,91,75,45,4,0,0,0,137,193
+.byte 139,9,83,80,81,232
.long ws2zt - (.+4)
.byte 91,91,89,95,80,87,81,83,233,211,255,255,255,88,88,88,137,227,137
.byte 193,131,233,8,137,25,137,195,131,235,12,139,27,137,217,131,225,3
.byte 106,0,80,83,83,133,201,15,132,8,0,0,0,88,106,19,233,22,0,0,0,88,80
-.byte 133,192,15,133,8,0,0,0,88,106,19,233,4,0,0,0,88,139,0,80,88,61,8,0
-.byte 0,0,15,132,12,0,0,0,88,104
+.byte 133,192,15,133,8,0,0,0,88,106,19,233,4,0,0,0,88,139,0,80,88,61
+.long RT_vector
+.byte 15,132,12,0,0,0,88,104
.long WB_vector_huh
.byte 80,233
.long raise$2 - (.+4)
-.byte 88,137,195,131,195,4,139,27,5,8,0,0,0,139,0,83,80,88,91,83,80,133
-.byte 219,15,142,31,0,0,0,88,91,75,137,193,131,193,4,139,0,83,81,80,232
+.byte 88,137,195,131,195,4,139,27,5,8,0,0,0,83,80,88,91,83,80,133,219,15
+.byte 142,31,0,0,0,88,91,75,137,193,131,193,4,139,0,83,81,80,232
.long ws2zt - (.+4)
.byte 91,91,89,95,80,87,81,83,233,213,255,255,255,88,88,88,137,227,137
.byte 193,131,233,12,137,25,137,195,131,235,4,139,27,137,193,131,233,8
Index: sys.wth
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/sys.wth,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- sys.wth 18 Sep 2002 21:08:01 -0000 1.13
+++ sys.wth 18 Sep 2002 21:12:38 -0000 1.14
@@ -9,6 +9,7 @@
(include linux)
(include wisptyp)
+(extern RT_vector)
(extern WB_c8string_huh)
(extern WB_cons_huh)
(extern WB_core)
Index: types.nasm
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/types.nasm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- types.nasm 22 Jul 2002 14:53:16 -0000 1.8
+++ types.nasm 18 Sep 2002 21:12:38 -0000 1.9
@@ -57,9 +57,6 @@
mov eax, WB_symbol
cmp edx, byte NC_SYMBOL
je .ret
- mov eax, WB_vector
- cmp edx, byte NC_VECTOR
- je .ret
mov eax, WB_c8string
cmp edx, byte NC_C8STRING
je .ret
--- vectors.nasm DELETED ---
|
