commit cf04eb0208918370fd8a627a602bc44d8337aaea
parent df639120f130649e9cb55ff61a66733a83328658
Author: Alexander Burger <abu@software-lab.de>
Date: Fri, 23 Sep 2011 15:43:00 +0200
Tags continued
Diffstat:
2 files changed, 58 insertions(+), 16 deletions(-)
diff --git a/src64/lib/asm.l b/src64/lib/asm.l
@@ -66,8 +66,8 @@
(de fpic ()
(on *FPic) )
-(de idxSrcs (Lbl)
- (idx '*Srcs (def Lbl 'src (file)) T) )
+(de idxSrcs (Lbl Src)
+ (idx '*Srcs (def Lbl 'src Src) T) )
# Sections
(de section (Fun @Sym)
@@ -84,18 +84,19 @@
(when (reg Lbl)
(quit "Register" Lbl) )
(when Lbl
- (idxSrcs Lbl)
- (def Lbl 'tag (cdr (file)))
+ (let Src (file)
+ (idxSrcs Lbl Src)
+ (def Lbl 'tag (cdr Src)) )
(label (setq *Label Lbl) T) )
(setq *Program
(make
(while (and (skip "#") (<> "(" (peek)))
(let Atom (read)
(cond
- ((memq Atom '(: ::)) # Label
+ ((== ': Atom) # Label
(let Lbl (read)
- (idxSrcs Lbl)
- (link ((if (== ': Atom) cons list) Atom Lbl)) ) )
+ (idxSrcs Lbl (file))
+ (link (cons Atom Lbl)) ) )
((== '? Atom) # Conditional
(unless (eval (read))
(while (and (skip "#") (n== '= (read)))) ) )
@@ -240,7 +241,7 @@
(| 2 (>> -4 N)) )
(de equ Args
- (idxSrcs (car Args))
+ (idxSrcs (car Args) (file))
(let Val (run (cdr Args) 1)
(def (car Args) 'equ Val)
(def (car Args) Val) ) )
@@ -436,9 +437,9 @@
(inc (destination) "*Mode")
(initCode)
(initData)
- (initFun (read) (read) (operand (read)))
+ (initFun (file) (read) (read) (operand (read)))
(initMain)
- (initSym (read) (read) (operand (read)))
+ (initSym (file) (read) (read) (operand (read)))
(jc (address) "*Mode")
(jcz (address) "*Mode")
(jeq (address) "*Mode")
@@ -456,6 +457,7 @@
(js (address) "*Mode")
(jsz (address) "*Mode")
(jz (address) "*Mode")
+ (:: (file) (read))
(ld (destination) "*Mode" (source) "*Mode")
(ld2 (source) "*Mode")
(ld4 (source) "*Mode")
@@ -515,7 +517,8 @@
(and Flg (prinl " .globl " Lbl))
(prinl Lbl ':) )
-(asm :: (Lbl)
+(asm :: (Src Lbl)
+ (idxSrcs Lbl Src)
(label Lbl T) )
(asm word (N)
@@ -536,13 +539,14 @@
(asm asciz (Str)
(prinst ".asciz" (pack "\"" Str "\"")) )
-(asm initFun (Lbl Name Val)
- (initSym Lbl Name Val (pack Val (and *AlignedCode "+2"))) )
+(asm initFun (Src Lbl Name Val)
+ (initSym Src Lbl Name Val (pack Val (and *AlignedCode "+2"))) )
-(asm initSym (Lbl Name Val)
- (initSym Lbl Name Val Val) )
+(asm initSym (Src Lbl Name Val)
+ (initSym Src Lbl Name Val Val) )
-(de initSym (Lbl Name Sym Val)
+(de initSym (Src Lbl Name Sym Val)
+ (and Lbl (idxSrcs Lbl Src))
(idx '*Tags (def Name Sym) T)
(setq Name
(let (N 2 Lst (chop Name) C)
diff --git a/src64/tags b/src64/tags
@@ -10,10 +10,14 @@ AF_INET sys/x86-64.linux.defs.l 138
AV ./glob.l 7
AV0 ./glob.l 8
Addr ./glob.l 614
+Adr ./glob.l 177
Alarm ./glob.l 77
AllocErr ./glob.l 1157
ArgErr ./glob.l 1186
Arrow ./glob.l 1173
+At ./glob.l 158
+At2 ./glob.l 159
+At3 ./glob.l 160
AtomErr ./glob.l 1192
Avail ./glob.l 11
BEG ./defs.l 44
@@ -21,6 +25,7 @@ BIG ./defs.l 35
BLK ./defs.l 53
BLKSIZE ./defs.l 54
BLKTAG ./defs.l 55
+BSym ./glob.l 154
BUFSIZ sys/x86-64.linux.defs.l 26
BadChain ./glob.l 1178
BadCount ./glob.l 1179
@@ -33,6 +38,7 @@ Break ./glob.l 50
BrkErr ./glob.l 1201
Buf ./glob.l 12
BufEnd ./glob.l 54
+Bye ./glob.l 179
CDR ./defs.l 37
CELLS ./defs.l 6
CHAR_DIGIT ./defs.l 64
@@ -40,6 +46,7 @@ CHAR_LETTER ./defs.l 63
CHAR_LOWERCASE ./defs.l 62
CHAR_UPPERCASE ./defs.l 61
CNT ./defs.l 34
+CSym ./glob.l 153
C_CC sys/x86-64.linux.defs.l 73
C_IFLAG sys/x86-64.linux.defs.l 71
C_LFLAG sys/x86-64.linux.defs.l 72
@@ -54,9 +61,11 @@ Child ./glob.l 44
Children ./glob.l 43
Chr ./glob.l 583
CircFree ./glob.l 1177
+Class ./glob.l 166
CloseErr ./glob.l 1203
CntErr ./glob.l 1188
Code ./main.l 4
+DB ./glob.l 144
DB1 ./defs.l 11
DBs ./glob.l 63
DIG ./defs.l 36
@@ -75,6 +84,7 @@ DbSizErr ./glob.l 1228
DbSyncErr ./glob.l 1220
DbWrErr ./glob.l 1227
DbfErr ./glob.l 1223
+Dbg ./glob.l 162
Delim ./glob.l 1171
DelimEnd ./glob.l 1172
DivErr ./glob.l 1195
@@ -112,8 +122,10 @@ EnvTask ./glob.l 606
EnvTrace ./glob.l 608
EnvYoke ./glob.l 600
EofErr ./glob.l 1209
+Err ./glob.l 172
ErrTok ./glob.l 1181
ExecErr ./glob.l 1156
+Ext ./glob.l 164
ExtErr ./glob.l 1190
ExtN ./glob.l 45
Extern ./glob.l 564
@@ -134,6 +146,7 @@ F_SETOWN sys/x86-64.linux.defs.l 52
F_UNLCK sys/x86-64.linux.defs.l 46
F_WRLCK sys/x86-64.linux.defs.l 45
Flock ./glob.l 612
+Fork ./glob.l 178
ForkErr ./glob.l 1205
GcCount ./glob.l 51
GcMarkEnd ./glob.l 129
@@ -150,6 +163,7 @@ HashBlank ./glob.l 1162
Heaps ./glob.l 10
Hear ./glob.l 39
Home ./glob.l 9
+Hup ./glob.l 168
I ./defs.l 14
II ./defs.l 15
III ./defs.l 16
@@ -157,6 +171,7 @@ INADDR_ANY sys/x86-64.linux.defs.l 141
INTERN ./defs.l 48
IN_ADDR sys/x86-64.linux.defs.l 130
ISIG sys/x86-64.linux.defs.l 74
+ISym ./glob.l 150
IV ./defs.l 17
IX ./defs.l 22
IdErr ./glob.l 1225
@@ -178,6 +193,7 @@ L_PID sys/x86-64.linux.defs.l 41
L_START sys/x86-64.linux.defs.l 39
L_TYPE sys/x86-64.linux.defs.l 37
L_WHENCE sys/x86-64.linux.defs.l 38
+Led ./glob.l 175
LineC ./glob.l 49
LineX ./glob.l 79
Link ./glob.l 19
@@ -188,15 +204,20 @@ LstErr ./glob.l 1193
MAXPATHLEN sys/x86-64.linux.defs.l 29
MakeErr ./glob.l 1197
MaxBlkSize ./glob.l 67
+Meth ./glob.l 145
Mic ./glob.l 37
Month ./glob.l 1144
+Msg ./glob.l 173
MsgErr ./glob.l 1200
NIX ./defs.l 43
+NSym ./glob.l 151
NUMBER ./defs.l 47
+Nil ./glob.l 134
NoFdErr ./glob.l 1208
NoMemory ./main.l 211
NumErr ./glob.l 1187
ONE ./defs.l 9
+OS ./glob.l 143
O_APPEND sys/x86-64.linux.defs.l 20
O_ASYNC sys/x86-64.linux.defs.l 54
O_CREAT sys/x86-64.linux.defs.l 17
@@ -212,8 +233,10 @@ OutFDs ./glob.l 27
OutFile ./glob.l 587
OutFiles ./glob.l 28
PIPE_BUF sys/x86-64.linux.defs.l 27
+PPid ./glob.l 156
PRepl ./glob.l 1140
Penv ./glob.l 56
+Pid ./glob.l 157
PidSigMsg ./glob.l 1158
PipeErr ./glob.l 1204
Pnl ./glob.l 57
@@ -221,6 +244,7 @@ ProtErr ./glob.l 1183
PutB ./glob.l 584
PutBinBZ ./glob.l 29
QuitMsg ./glob.l 1159
+Quote ./glob.l 146
RTLD_GLOBAL sys/x86-64.linux.defs.l 33
RTLD_LAZY sys/x86-64.linux.defs.l 32
Redefined ./glob.l 1163
@@ -236,6 +260,7 @@ Retnc ./main.l 13
Retnz ./main.l 19
Retz ./main.l 16
RolbLog ./glob.l 1175
+Run ./glob.l 167
SA_FLAGS sys/x86-64.linux.defs.l 84
SA_HANDLER sys/x86-64.linux.defs.l 82
SA_MASK sys/x86-64.linux.defs.l 83
@@ -271,6 +296,7 @@ SOCK_DGRAM sys/x86-64.linux.defs.l 140
SOCK_STREAM sys/x86-64.linux.defs.l 139
SOL_SOCKET sys/x86-64.linux.defs.l 142
SO_REUSEADDR sys/x86-64.linux.defs.l 143
+SSym ./glob.l 152
STACK ./defs.l 7
STAT sys/x86-64.linux.defs.l 57
ST_MODE sys/x86-64.linux.defs.l 58
@@ -280,14 +306,18 @@ SYM ./defs.l 39
S_ADDR sys/x86-64.linux.defs.l 131
S_IFDIR sys/x86-64.linux.defs.l 62
S_IFMT sys/x86-64.linux.defs.l 61
+Scl ./glob.l 165
Seed ./glob.l 31
SelectErr ./glob.l 1213
Sep0 ./glob.l 52
Sep3 ./glob.l 53
SetFD ./glob.l 1170
+Sig1 ./glob.l 169
+Sig2 ./glob.l 170
Sigio ./glob.l 78
Signal ./glob.l 60
Slot ./glob.l 35
+Solo ./glob.l 155
SpMiPipe ./glob.l 38
Spkr ./glob.l 36
Stack0 ./glob.l 15
@@ -319,11 +349,14 @@ TM_SEC sys/x86-64.linux.defs.l 114
TM_YEAR sys/x86-64.linux.defs.l 119
TOP ./defs.l 10
TRANSIENT ./defs.l 49
+TSym ./glob.l 147
Talking ./glob.l 42
Tell ./glob.l 40
TellBuf ./glob.l 41
TellErr ./glob.l 1229
Termio ./glob.l 21
+TgOS ./glob.l 558
+This ./glob.l 161
ThrowErr ./glob.l 1166
TickS ./glob.l 34
TickU ./glob.l 33
@@ -335,11 +368,14 @@ Transient ./glob.l 75
Trc1 ./glob.l 1167
Trc2 ./glob.l 1168
TruncErr ./glob.l 1219
+Tsm ./glob.l 176
TtyPid ./glob.l 24
UDPMAX ./defs.l 58
USec ./glob.l 23
UdpOvflErr ./glob.l 1235
UndefErr ./glob.l 1236
+Uni ./glob.l 174
+Up ./glob.l 171
V ./defs.l 18
VI ./defs.l 19
VII ./defs.l 20
@@ -358,6 +394,7 @@ WrLogErr ./glob.l 1218
WrSyncErr ./glob.l 1216
YieldErr ./glob.l 1199
ZERO ./defs.l 8
+Zap ./glob.l 163
_a_ ./glob.l 1149
_ap_ ./glob.l 1150
_dot_ ./glob.l 1151
@@ -1013,6 +1050,7 @@ packExtNmX_E ./db.l 87
packOctACX_CX ./db.l 120
parseBCE_E ./io.l 3893
pathStringE_SZ ./io.l 1172
+pico ./glob.l 142
pipeErrX ./err.l 510
popCtlFiles ./io.l 1961
popErrFiles ./io.l 1954
