qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-12-12 13:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
10057 commits 17 branches 20 tags 29 MiB
Commit graph

2163 commits

Author SHA1 Message Date
Bill Currie
1e72e3eb20 Make the post-optimization sblocks dump optional. 2012-11-19 15:24:09 +09:00
Bill Currie
bcde7396a0 Don't let generate_assignments guess the type. 
It fails when both source and destination are void, but since the dag node
itself does know the correct type, pass in the type rather than guessing.
 2012-11-19 15:21:01 +09:00
Bill Currie
68bf013601 Use a dag-local live vars set. 
Function calls need to ensure .param_N actually get assigned, and so the
params must be seen as live by the dead variable removal code. However, it
is undesirable to modify the live vars data of the flow node, so make a
local copy.
 2012-11-19 15:18:31 +09:00
Bill Currie
d1252813ce Use low_level_type instead of extract_type. 
extract_type doesn't understand enums (by design?). qwaq's types.r now
compiles.
 2012-11-19 13:49:34 +09:00
Bill Currie
f2cc82469a Use the correct field when dechaining aliases. 
op_type and type always confuse me :P
 2012-11-19 12:53:08 +09:00
Bill Currie
c03511734d Fix a dreaded uninitialized variable. 
Sneaky bastard :P (typo)
 2012-11-19 12:52:24 +09:00
Bill Currie
674c823547 Set the operand type for op_label. 
It was never set before (and thus void), but as it now needs to be
ev_short, set it when getting the fake def used for label operands.
 2012-11-19 12:30:23 +09:00
Bill Currie
5018f5147c Use operand types rather than def types to select opcodes. 
With temp types changing and temps being reused within the one instruction,
the def type is no longer usable for selecting the opcode. However, the
operand types are stable and more correct.
 2012-11-19 12:28:41 +09:00
Bill Currie
60321061d2 Fix dot_expr.c to work with dump_dot(). 2012-11-19 12:14:02 +09:00
Bill Currie
e70b59b925 Don't null the def pointer when freeing a temp. 
It makes debugging more difficult.
 2012-11-19 11:02:31 +09:00
Bill Currie
3cffeb7b66 Handle assignment from void defs. 
The main void defs are .return and .param_N. If the source operand is void,
use the destination operand's type to alias the source operand rather than
the source operand's type to alias the destination's operand (the usual
case).
 2012-11-19 11:00:04 +09:00
Bill Currie
158e261a8f Give reusable temps their own linked list. 
The next field is used for linking all defs in a space. Oops.
 2012-11-19 10:33:03 +09:00
Bill Currie
1af4d5eeed Ensure reused temps have the correct type. 
The type of a temp may change through its life as it's really the location
and name that are reused.
 2012-11-19 10:31:22 +09:00
Bill Currie
4e8e94a1b2 Detect aliased temopary variables. 
This takes care of some temps not being freed.
 2012-11-18 20:29:40 +09:00
Bill Currie
3d1792d2fc Properly count users of a tempory variable. 
The dags code isn't the only place that creates temporary variables, so
count them as they go into a statement rather than when they're created.
This fixes the temp underflows.
 2012-11-18 20:27:26 +09:00
Bill Currie
0c3aeb30aa Reuse tempary variables. 
Now that I've got nice code, it was worth doing. Unfortunatly, bsearch
style switch statements have problems.
switch.r:14: BUG: temp users went negative: <tmp 0x21b6840:-1>
switch.r:14: BUG: temp users went negative: <tmp 0x21b6840:-2>
switch.r:14: BUG: temp users went negative: <tmp 0x21b6840:-3>
switch.r:14: BUG: temp users went negative: <tmp 0x21b67d0:-1>
 2012-11-18 19:10:18 +09:00
Bill Currie
c5fa4fe92a Generate code from the dag in topological sort order. 
Nicely, the need for dag_gencode to recurse seems to have been removed.

At least for a simple case, correct code is generated :)

	switch.r:49:    case 1:         *to = *from++;
	003b loadbi.i *(from + 0), .tmp10
	003c add.i from, .imm, from
	003d storep.i .tmp10, *to
 2012-11-18 13:10:19 +09:00
Bill Currie
1452dcca9a Create dependency edges. 
A node that writes to a var must be evaluated after any node that reads
that var, so for any node reading var, add that node to the edges of the
node currently associated with the var (unless the node is a child of the
node reading the var).
 2012-11-18 12:56:27 +09:00
Bill Currie
8fe71f2146 Display a dagnode's extra dependency edges. 2012-11-18 12:55:44 +09:00
Bill Currie
d3f010a81b Fix the flow-dag connections in the flow graphs. 2012-11-18 11:34:01 +09:00
Bill Currie
d58595660f Treat newly created nodes as root nodes. 
When a node is made a child of another node, it is removed from the dag's
set of root nodes.
 2012-11-18 10:50:10 +09:00
Bill Currie
af4e56bba8 Topologically sort the dag. 
It doesn't make any difference yet, but that's because I need to add extra
edges indicating iter-node dependencies. However, the sort does seem to
work for its limited input.
 2012-11-18 09:23:01 +09:00
Bill Currie
668871205a Add the child nodes to the node's edges set. 2012-11-17 22:12:03 +09:00
Bill Currie
dcc786b16f Remove dead variables after creating the dag. 
Not adding them while creating the dag completely broke the dag as
node(deadvar) always returned null. Code quality is back to where it was
before the dags rewrite.
 2012-11-17 22:08:46 +09:00
Bill Currie
deb5484c7e Move the node/label numbering into the alloc funcs. 
I should have done it this way in the first place. much cleaner.
 2012-11-17 21:55:59 +09:00
Bill Currie
12133bc02f Rewrite dags to use sets. 
While things are quite broken now (very incorrect code is being generated),
the dag is much easier to work with. The dag is now stored in an array of
nodes (the children pointers are still used for dagnode operands), and sets
are used for marking node parents, attached identifiers and (when done,
extra edges).
 2012-11-17 21:14:42 +09:00
Bill Currie
0bb2fc1891 Fix the lost line numbers on simple assignments. 
Instead of storing the generating statement in the dagnode, the generating
expression is stored in the daglabel. The daglabel's expression pointer is
updated each time the label is attached to a node. Now I know why debugging
optimized code can be... interesting.
 2012-11-17 12:07:27 +09:00
Bill Currie
43d77900d5 Rewrite dag_gencode to use statement/node types. 
It now seems to generate correct code for each node. However, node order is
still incorrect in places (foo++ is being generated as ++foo). quattest.r
actually executes and produces the right output :)
 2012-11-16 22:09:49 +09:00
Bill Currie
872b13616d Ensure return's operand gets set properly. 
Yay for coding and designing at the same time, not :P
 2012-11-16 21:50:27 +09:00
Bill Currie
bd5a790456 Support statement labels in dags. 
While the code is broken in places, switch.r generates code again.
 2012-11-16 20:12:13 +09:00
Bill Currie
4c6381d035 Mostly fix dag_create to work with flow_analyze_statement. 
Label operands aren't handled properly, but dags are getting generated
again (better than before: return and goto are in).
 2012-11-16 20:03:30 +09:00
Bill Currie
1100efba54 Nuke find_operands in favor of flow_analyze_statement. 
flow_analyze_statement uses the statement type to quickly determin which
operands are inputs and which are outputs. It takes (optional) sets for
used variables, defined variables and killed variables (only partially
working, but I don't actually use kill sets yet). It also takes an optional
array for storing the operands: index 0 is the output, 1-3 are the inputs.
flow_analyze_statement clears any given sets on entry.

Live variable analysis now uses the sets rather than individual vars. Much
cleaner code :).

Dags are completely broken.
 2012-11-16 19:33:37 +09:00
Bill Currie
001e1ac059 Classify statements into broad types. 
The types are expression, assignment, pointer assignment (ie, write to a
dereferenced pointer), move (special case of pointer assignment), state,
function call/return, and flow control. With this classification, it will
be easier (less code:) to determine which operands are inputs and which are
outputs.
 2012-11-16 16:16:06 +09:00
Bill Currie
d0c37bbc51 Change the int<->float conversion opcode string. 
Using "=" was rather confusing, so changing it to "<CONV>" seems to be a
good idea. As the string is used only for selecting opcodes at compile
time, only qfcc is affected.
 2012-11-16 14:47:54 +09:00
Bill Currie
b8b626ee81 Change the int<->float conversion opcode string. 
Using "=" was rather confusing, so changing it to "<CONV>" seems to be a
good idea. As the string is used only for selecting opcodes at compile
time, only qfcc is affected.
 2012-11-16 14:45:11 +09:00
Bill Currie
c1776fc2ad Make the dags in flow graphs a little easier to read. 2012-11-16 12:42:57 +09:00
Bill Currie
db605fa998 Improve the type accuracy of dag_gencode. 
Surprisingly, I don't yet have to "throw one out", but things are still
problematic: rcall1 is getting two arguments, goto and return get lost,
rcall2 got an old temp rather than the value it was supposed to, but
progress :)
 2012-11-15 17:58:33 +09:00
Bill Currie
3bfa89ca8b Clean up the operand type fixing. 
It doesn't help any yet, but it will make things easier later on.
 2012-11-15 17:15:34 +09:00
Bill Currie
012a521dc5 Strip aliases off daglabel operands. 
However, the original type of the operand, as seen by the statement, is
kept. Mostly works, but has some problems with plistmenu.r
 2012-11-15 15:53:51 +09:00
Bill Currie
c1a5c1a7b2 Create alias_operand (). 2012-11-15 15:52:30 +09:00
Bill Currie
095210893f Ensure alias operands are never nested. 
No more than one level of aliasing is ever needed, so strip off any
intervening aliases that show up.
 2012-11-15 15:18:00 +09:00
Bill Currie
fb82a96cc7 Better handling of progs.dat and line numbers. 
Not enough testing :P
 2012-11-15 15:04:51 +09:00
Bill Currie
6621a42da9 Better handling of progs.dat and line numbers. 
Not enough testing :P
 2012-11-15 14:53:09 +09:00
Bill Currie
1c32ac8ce6 Expose new_statement, too. 2012-11-15 13:44:09 +09:00
Bill Currie
69543cf85b Fix an uninitialized variable. 
It was never a propblem until an attempt to dump empty sblocks was made.
 2012-11-15 13:44:09 +09:00
Bill Currie
d76e2a8423 Make a start on regenerating code from dags. 
Some parts are a lot messier than I thought, so the actual codegen in the
dags code is just a minimal stub for now.
 2012-11-15 13:44:09 +09:00
Bill Currie
802e1981bb Expose some statements functions needed for code gen. 2012-11-15 13:44:09 +09:00
Bill Currie
c43a8331cf Expose dump_dot_sblock. 2012-11-15 13:44:09 +09:00
Bill Currie
88b8bebe3c Detach dead temporary variables from dag nodes. 
This allows temporary variables that are used in multiple nodes to remain
in the dag, but also will allow more freedom when generating code from the
dag.
 2012-11-15 13:44:08 +09:00
Bill Currie
fe13f21d9d Fix a segfault causing c&p error. 
Found when I tried to skip attaching temporary vars to dag nodes (which
proved to be a bad move in the end, but exposing bugs is good).
 2012-11-15 13:44:08 +09:00
Bill Currie
2b2ea5c9b3 Compute dags as part of data flow analysis. 
I want to use the live variable information when building the dags.
 2012-11-15 13:44:08 +09:00
Bill Currie
c358a0e77e Create a function to generalize dot dumping. 
Now, any time a graph is wanted, the file can be consistently named without
a lot of messy code.
 2012-11-15 13:44:08 +09:00
Bill Currie
5051c922a5 Ensure alias operands are properly freed. 2012-11-15 13:44:08 +09:00
Bill Currie
9f409b1ac4 Rename make_dag to dag_create. 2012-11-15 13:44:08 +09:00
Bill Currie
16410332af Create the dags list in execution order. 
The root nodes of the dag need to be evaluated in execution order as some
roots may depend on the results of earlier roots (but then, this might also
be related to the problem of function calls not specifying all of their
parameters to the dag).
 2012-11-15 13:44:08 +09:00
Bill Currie
e77d3b9e54 Fix a missed colspan in sblock dumps. 2012-11-15 13:44:08 +09:00
Bill Currie
783b4082a1 Produce tidier dag dumps. 2012-11-15 13:44:08 +09:00
Bill Currie
04a8e19481 Move the flow-var use/define calcs to a better place. 
dags.c really isn't the right place. The only reason it wasn't in flow.c in
the first place is find_operands was in the wrong place.
 2012-11-15 13:44:08 +09:00
Bill Currie
c4d4174ebc Make some minor improvements to flow graph dumps. 2012-11-15 13:44:08 +09:00
Bill Currie
3298e4d67e Ensure find_operands sets the operands to known values. 
This fixes the last of the bogus live variables.
 2012-11-15 13:44:08 +09:00
Bill Currie
e3a49df0a8 Set def after setting use. 
An instruction that both reads and writes the same variable will read the
variable before writing to it, so the instruction uses the variable rather
than defines it (for live-variable purposes).
 2012-11-15 13:44:08 +09:00
Bill Currie
58cb73d6aa Remember to union the node's use with (out - def) 
Oops.
 2012-11-15 13:44:08 +09:00
Bill Currie
cd224c00d4 Add live variable info to flow graph dumps. 
Things are a little bogus, but at least the bogosity is visible :)
 2012-11-15 13:44:08 +09:00
Bill Currie
8817c4a1c2 Re-enable the flow graph dumping. 
It's still in a bogus place, but it's necessary.
 2012-11-15 13:44:08 +09:00
Bill Currie
3c79f07705 Fix an out-by-one error in the set operators. 
I have no idea why I added that - 1.
 2012-11-15 13:44:08 +09:00
Bill Currie
4b64912793 Begin doing some data flow analysis. 
In te beginning, live variables.
 2012-11-15 13:44:08 +09:00
Bill Currie
c00e666668 Expose find_operands. 
It has proven to be a generally useful function, not just for dags.
 2012-11-15 13:44:08 +09:00
Bill Currie
5514c8db3c Print the statement number in the sblock output. 2012-11-15 13:44:08 +09:00
Bill Currie
0b49bd343c Collect information on statements that set or use vars. 
First, it turns out using daglabels wasn't such a workable plan (due to
labels being flushed every sblock). Instead, flowvars are used. Each actual
variable (whether normal or temp) has a pointer to the flowvar attached to
that variable.

For each variable, the statements that use or define the variable are
recorded in the appropriate set attached to each (flow)variable.
 2012-11-15 13:44:08 +09:00
Bill Currie
7404aacab7 Resurrect dags building and printing. 
However, this time it's done after the statement recording (so the
statement numbers are set).
 2012-11-15 13:44:08 +09:00
Bill Currie
acedc65de1 Make an array of statements for the function. 
With this, sets can be used to represent statements.
 2012-11-15 13:44:07 +09:00
Bill Currie
98245f6d00 Bury a dead field. 2012-11-15 13:44:07 +09:00
Bill Currie
8844ac61a2 Rename dump_flow to dump_sblock and move to dot_sblock.c 2012-11-15 13:44:07 +09:00
Bill Currie
d6d03a63b4 Print the depth-first order of the flow graph nodes. 2012-11-15 13:44:07 +09:00
Bill Currie
acc3beb6ab Make flow_find_dominators a little more robust. 
While a non-initial node not having predecessors is really an internal
error, segfaulting because of it is not nice.
 2012-11-15 13:44:07 +09:00
Bill Currie
acde6ca0a0 Handle jumpb statements in dot_sblock and flow graphs. 2012-11-15 13:44:07 +09:00
Bill Currie
ffa08a99c2 Store the initializer expression in the def. 
Initially, this will be used for collecting the targets of a jumpb
instruction.
 2012-11-15 13:44:07 +09:00
Bill Currie
d7177a78e9 Rewrite the flow graph code. 
The flow graph nodes are now properly separated from the graph, and edge
information is stored in the graph struct. This actually made for much
cleaner code (partly thanks to the use of sets and set iterators).

Flow graph reduction has been (temporarily) ripped out as the entire
approach was wrong. There was also a bug in that I didn't really understand
the dragon book about selecting nodes and thus messed things up. The
depth-first search tree "fixed" the problem, but was really the wrong
solution (sledge hammer :P).

Also, now that I understand that dot's directed graphs must be acyclic, I
now have much better control over the graphs (back edges need to be
flipped).
 2012-11-15 13:44:07 +09:00
Bill Currie
b9599a7119 Better set memory management. 
At the cost of one pointer per set, sets can now be allocated and freed
more efficiently (especially since malloc might round things up).
 2012-11-15 13:44:07 +09:00
Bill Currie
2385cf65c2 Rename setstate_t to set_iter_t. 
After all, it is an iterator :).
 2012-11-15 13:44:07 +09:00
Bill Currie
d3d88290b5 Mostly satisfactory output of nested regions. 
It turns out dot does not like cyclic graphs (thus some of the weird
layouts), but fixing it by flipping back-edges requires proper recording of
edge info (I guess that's what T is for in the dragon book).
 2012-11-15 13:44:07 +09:00
Bill Currie
8c5a2b3d11 Implement depth-first searching for flow graphs. 
This fixes the bogusly irreducible graphs.
 2012-11-15 13:44:07 +09:00
Bill Currie
53622dbb99 Perform graph reduction on the function's flow graph. 
The reduction is performed itteratively until the graph is irreducible, but
such that each reduction wraps the previous graph. Unfortunately, due
depth-first searching not being implemented, graphs that should be reduced
(ie, those with natural loops).
 2012-11-15 13:44:07 +09:00
Bill Currie
388b6e6e8f Add set_size (). 
Return the number of members in the set.
 2012-11-15 13:44:07 +09:00
Bill Currie
8567508963 Rewrite set_first() and add set_next(). 
set_first() now returns a pointer to a setstate_t struct that holds the
state necessary for scanning a set. set_next() will automatically delete
the state block when the end of the set is reached. set_delstate() is also
provided to allow early termination of the scan.
 2012-11-15 13:44:07 +09:00
Bill Currie
2da038ce0f Bring back dot_flow.c. 
However, it produces simplified flow graphs (ie, just nodes and edges, no
statements, though later on data flow information will be added).
 2012-11-15 13:44:07 +09:00
Bill Currie
8b374305d2 Rename dot_flow.c and print_flow. 
They're now dot_sblock.c and print_sblock. The new names both better
reflect their purpose and free up "flow" for outputting the real flow
analysis graphs.
 2012-11-15 13:44:07 +09:00
Bill Currie
c483770121 Rework flow.c with the aim of graph reduction. 
Much of the data recently added to sblock_t has been moved to flownode_t.
No graph reduction is carried out yet, but the initial (innermost level)
graph has been built.
 2012-11-15 13:44:07 +09:00
Bill Currie
da446fd343 Detect natural loops. 
Non-nested loops that have the same head-node are merged into one loop.
However, loop nesting is not currently detected (next step).
 2012-11-15 13:44:07 +09:00
Bill Currie
8fb958603c Add set_first. 
It returns the first element of a set. If the set is empty, -1 (unsigned)
is returned.
 2012-11-15 13:44:07 +09:00
Bill Currie
4cc8d4a04b Fix an apparent snafu in set_test. 
It looks like a bit of case&paste where I forgot to change != to &.
 2012-11-15 13:44:07 +09:00
Bill Currie
1fead50f4e Calculate the dominators of each node in the flow graph. 
The dominators are represented by sets using the node numbers.
 2012-11-15 13:44:07 +09:00
Bill Currie
964ea7f9fe Add set_as_string for debug output. 2012-11-15 13:44:07 +09:00
Bill Currie
d2fab28d01 Implement set_is_member. 
Oops, forgot that one.
 2012-11-15 13:44:06 +09:00
Bill Currie
7853bf1859 Calculate a node's successors and predecessors. 
The dot graphs are a little odd (arrow heads on the wrong end of the
predecessor edges), but things seem to be correct.
 2012-11-15 13:44:06 +09:00
Bill Currie
739ebc522c Begin working on flow analysis. 
For now, variable and flow graph node maps are built.
 2012-11-15 13:44:06 +09:00
Bill Currie
5acf474882 Double quote dag labels. 
Dot interprets escape sequences in non-html string, and needs the quotes to
be escaped, so quote the result of operand_string. Unfortunately,
operand_string uses quote_string and quote_string returns a static pointer,
so some hoop-jumping is necessary.
 2012-11-15 13:44:06 +09:00
Bill Currie
cdc790d0c8 Add a set type and support code. 2012-11-15 13:44:06 +09:00
Bill Currie
60d03dbdd9 Fix the naive opcode checks. 
Confusing . with .=, and < and <= with more <MOVE etc isn't good.
 2012-11-15 13:44:06 +09:00
Bill Currie
dc9d2a982e Make the returned dag a linked list of root-nodes. 
A dag can have mulitple "root" nodes (ie, nodes with no parents).
 2012-11-15 13:44:06 +09:00
Bill Currie
a22260030a Use value for pointer operands. 
This allows daglabels on pointer operands without a redundant daglabel
pointer.
 2012-11-15 13:44:06 +09:00
Bill Currie
0c58cd9067 Generate only one daglabel for value operands. 
As each value is now unique, their labels can also be unique, which will
improve CSE.
 2012-11-15 13:44:06 +09:00
Bill Currie
16869cabd1 Fix a slew of uninitialized data problems. 
Bah, structs on stacks... good fun :P
 2012-11-15 13:44:06 +09:00
Bill Currie
01c8aaae8c Add some error checking for attaching identifiers. 2012-11-15 13:44:06 +09:00
Bill Currie
0ccf4093e4 Handle attached identifier labels correctly. 
I'd forgotten I had the prev field. Makes for much cleaner code.
 2012-11-15 13:44:06 +09:00
Bill Currie
0cedf0d13a Fix a bunch of mis-uses of an expressions's value. 
The value field really should be treated as constant.
 2012-11-15 13:44:06 +09:00
Bill Currie
28ce35f1c1 Make values independent objects. 
values are now uniquely allocated (for the current object file). With
this, constants in dags will work.
 2012-11-15 13:44:06 +09:00
Bill Currie
c57df8b5f3 Print all dag nodes in a dag. 
Dags can have multiple roots, so only recursing once could miss much of the
dag.
 2012-11-15 13:44:06 +09:00
Bill Currie
dbf1aa8f72 Attach dags to statement blocks. 
Now, if a dag is attached to a statement block, it will be included in the
flowgraph with that statement block.
 2012-11-15 13:44:06 +09:00
Bill Currie
39506881c0 Fix the completely bogus handling of "x" in dag creation. 
That made a complete mashup of attached identifiers :P
 2012-11-15 13:44:06 +09:00
Bill Currie
24553867a4 Use dashed lines for attached identifiers in dags. 2012-11-15 13:44:06 +09:00
Bill Currie
aa72f263ec Use an extra temp for v6 float modulo. 
It seems the dag creation algorithm doesn't like "a = a op a", so use
"b = a op a" instead. Since I plan on fixing temp leaks anyway, this won't
be a problem (also, few people even use qfcc's v6 float modulo :P).
 2012-11-15 13:44:06 +09:00
Bill Currie
d9354255a3 Avoid double-printing dag nodes. 2012-11-15 13:44:05 +09:00
Bill Currie
7b2e426545 Support temp operands in dags. 2012-11-15 13:44:05 +09:00
Bill Currie
9bc65ffedb Start actually trying to build dags. 
Temporary variables aren't being handled correctly (treated as constants),
but it looks like a good start.
 2012-11-15 13:44:05 +09:00
Bill Currie
b7b6294d87 Fix some dag printing goofs. 
Typo and no node recursion.
 2012-11-15 13:44:05 +09:00
Bill Currie
aa2943709e Start work on building dags from basic blocks. 
Doesn't compile and the design is in flux anyway, but I want to get back to
iqm.
 2012-11-15 13:44:05 +09:00
Bill Currie
60108c688c Change dags from binary to trinary. 
I'd forgotten some instructions take three inputs that can benefit from
CSE.
 2012-11-15 13:44:05 +09:00
Bill Currie
0fefeb73fe Initial support for basic block dags. 
Currently, only dumping to dot, but that seems to be a very sensible place
to start: debug support.
 2012-11-15 13:44:05 +09:00
Bill Currie
ee8247ec61 Support using enums as array indices. 2012-11-15 13:39:23 +09:00
Bill Currie
f18a4d3c4a Support pointer - pointer. 2012-11-15 13:38:57 +09:00
Bill Currie
552142497e Support progs.dat when dumping type encodings. 
Knock up a quick and dirty progs-to-qfo "converter" (strings and types
only) to re-use the qfo types dumper.
 2012-11-15 11:58:13 +09:00
Bill Currie
9691b50f0f Make .type_encodings more useful. 
Rather than just a pointer, it is now a struct with a pointer and size
indicating the extent of the type encodings block.
 2012-11-15 11:57:16 +09:00
Bill Currie
74ac4ee142 Fix a misplaced line. 2012-11-15 11:00:51 +09:00
Bill Currie
39c1034afb Relocate the data in the type encodings space. 
Because of the way it is used, the data in the type encodings space needs
to always be correct (ie, relocated), even for partially linked object
files.
 2012-11-14 20:37:19 +09:00
Bill Currie
453ac11bc3 Correct some comments. 2012-11-14 17:13:14 +09:00
Bill Currie
2685d38059 More paranoia when dumping qfo type encodings. 2012-11-14 16:32:41 +09:00
Bill Currie
3b3e013d4a Do not demand a defined def is actually global. 
Rather, only that it is neither external nor local. The idea was to catch
myself swapping the arguments to resolve_external_def, but for some reason
I decided type encoding defs would not be global (save game reasons?).
 2012-11-14 15:50:55 +09:00
Bill Currie
acc188d62b Ressurect the builtin symbol type fixup. 
I was a little overzealous when gutting process_type_space :P
 2012-11-14 15:49:19 +09:00
Bill Currie
33eb3f2418 A bit of pointer saftey in add_defs. 
Directly accessing odef after can be dangerous (probably not here, but
hey), so use the defref instead.
 2012-11-14 13:25:30 +09:00
Bill Currie
00c87434bf A touch of whitespace. 2012-11-14 13:25:03 +09:00
Bill Currie
281e203545 Make process_data_def use the correct def tables. 
Fixes the bogus redefined errors when entity fields are used.

Also, rename extern_defs and defined_defs to extern_data_defs and
defined_data_defs (more consistent with the other tables).
 2012-11-14 13:14:54 +09:00
Bill Currie
e05c12e16d Make linker_add_def take a pointer for the value. 
While it looks like I might not use it for the type encodings, it should be
useful in the future.
 2012-11-14 13:12:58 +09:00
Bill Currie
51236b0693 Fix the incorrect type space reloc offsets. 
The problem was caused by add_relocs and process_loose_relocs adjusting the
reloc offset based on the reloc's space's base address. This is fine for
most relocs, but as relocs for the type space have already been adjusted by
process_type_space, those relocs must be left alone by add_relocs and
process_loose_relocs. As a bonus, the duplicate code has been refactored
into a separate function :)
 2012-11-14 10:29:45 +09:00
Bill Currie
31739f4dbf Rewrite the type_space processing. 
Now each encoding is copied across def by def using memcpy, with the
expectation that any references to other types will be handled via the
reloc system. Unfortunately, it seems there's an off-by-4 (hmm, suspicious
number...) in the reloc offsets, but I'll look into that after I get some
sleep.
 2012-11-13 21:55:54 +09:00
Bill Currie
8625964634 Fix some careless inernal_error changes. 
Back when I did the abort->internal_error change, I wasn't paying attention
and forgot I should use linker_internal_error in linker.c.
 2012-11-13 21:51:16 +09:00
Bill Currie
f80a74228c Add (and use) alloc_data for work qfo data allocations. 
defspace_alloc_loc can cause a realloc which will break the work qfo space
data pointers, so wrap it with alloc_data, which updates the appropriate
pointers and sizes.
 2012-11-13 21:48:46 +09:00
Bill Currie
d782622e74 Be more paranoid when dumping qfo type encodings. 2012-11-13 21:24:48 +09:00
Bill Currie
f002f3ad7a Escape strings for reloc dumps. 
Line feeds messing up the output wasn't nice :P.
 2012-11-13 21:14:51 +09:00
Bill Currie
1dd8f34190 Refactor process_def. 
The field/data def handling has been moved into process_data_def and
process_field def. The code for handling external defs has been moved into
its own function (extern_def()),

In passing, rename add_space to add_data_space, since it is limited to
handling data spaces.
 2012-11-13 13:16:45 +09:00
Bill Currie
ba6fb5802d Make add_defs take a function to process the defs. 
For now, no other change has been made, but I'll be able to split up
process_def for data def vs field def processing and add a function for
processing type encoding defs.
 2012-11-13 12:40:40 +09:00
Bill Currie
93b007b1f8 Take care of relocs when defining external defs. 
For most of the cases, some relocs may have been lost, but they were
certainly lost for type encodings. Now that all seems to be fixed.
 2012-11-12 16:14:09 +09:00
Bill Currie
eb5581c7bd Fix class type encoding. 
First, the class def needed to be created before the class type, then the
def space indices had to be set early, otherwise the relocs wound up with
space 0 instead of the correct space.
 2012-11-12 12:46:15 +09:00
Bill Currie
c96718493a A bit of a cleanup before fixing class type defs. 
All internal structs now have "proper" names, and fit the naming convention
(eg, obj_module (like objective-c's types, but obj instead of objc). Some
redundant types got removed (holdovers from before proper struct tag
handling).

Also, it has proven to be unnecessary to build internal classes, so
make_class and make_class_struct are gone, too.
 2012-11-12 11:12:33 +09:00
Bill Currie
6ec5bb1884 Change the FIXME to a comment as to why nothing is done. 
Of course, the relocation record still needs to be written (don't know why
it isn't), but that's next :)
 2012-11-11 20:36:25 +09:00
Bill Currie
d13ce81b4f Ensure the type's encoding string is valid. 
When encoding a type to a qfo file, the type's encoding string is written
and thus needs to be valid prior to actually doing the encoding. The
problem occurs mostly in self-referential structs (particularly, obj_class)
because the struct is being encoded prior to the pointer to the struct.
 2012-11-11 20:22:48 +09:00
Bill Currie
8710977323 Rework transfer_type to avoid infinite recursion. 
This is similar to the problem with infinite recursion when encoding types.
The problem is with structs with self-referential pointers (eg, struct foo
{struct foo *bar}). The solution is to copy the type data to a buffer and
mark the buffer as transfered before actually processing the type. Further
processing of the type is done via the buffer.
 2012-11-11 20:20:07 +09:00
Bill Currie
edd381931e Create obj_object after obj_class. 
obj_class is self-referential,but obj_object refers to obj_class. This gets
obj_class encoded properly.
 2012-11-11 19:08:15 +09:00
Bill Currie
96110a0f54 Treat messages to id and Class separately. 
As id and Class do not point to real objects as such, trying to get the
class from their types doesn't work, so instead send the message to a
"null" class that skips the method checks.
 2012-11-11 17:39:12 +09:00
Bill Currie
ee28f3869c Fix the checking for assignments between id and Class. 
With Class now being struct obj_class rather than an actual class or
object, checking for Class now needs to be explicit.
 2012-11-11 17:24:33 +09:00
Bill Currie
694b268f53 Correct the type of id. 
It should be struct obj_object * rather than Object *.
 2012-11-11 17:22:57 +09:00
Bill Currie
35a88d873c Rework the builtin class creation once again. 
Now the classes are built "properly" (using the same tools as the parser
itself), and the structs (obj_object, obj_class and obj_protocol) are built
separately, but using the class ivars.
 2012-11-11 16:23:04 +09:00
Bill Currie
b36bd3a988 Remove the list offsets from the class ivars. 
Even just before, type_obj_object, type_obj_class and type_obj_protocol
were a bit bogus (still are), but now the arrays used to list their ivars
are correct. I plan to create the above mentioned types using
class_to_struct to do it properly.
 2012-11-11 09:52:55 +09:00
Bill Currie
0cf16ac558 Make _OBJ_CLASS_foo the correct type. 
It needs to be type_obj_class, but I had gotten confused earlier when
rearranging the type names as I was having trouble with "not a class"
errors.
 2012-11-10 13:45:38 +09:00
Bill Currie
06fd912a09 Make super_class for the internal Protocol and Class objects. 
They're based on Object, and that needs to be represented properly.
 2012-11-10 13:01:56 +09:00
Bill Currie
86091856be Revamp the static class creation. 
Type names are cleaned up, as is the creation. Also, the class pointer in
the type encoding now gets emitted. However, Still need to actually create
_OBJ_CLASS_Class and fix the type encoding reloc handling in the linker.
 2012-11-10 12:56:19 +09:00
Bill Currie
d33d062bd1 Rearrange class_message_response. 
Even if an object doesn't seem to respond to a message, return the message
so unrelated warnings or errors don't occur.
 2012-11-09 19:18:09 +09:00
Bill Currie
fd8c639773 Initialize current_symtab early, with pr.symtab. 
This (with the previous commit) fixes the problems with the tags for
builtin structs.
 2012-11-09 14:37:28 +09:00
Bill Currie
9cb0ca6fed Catch symtab operations with an invalid symtab. 
Just via a simple segfault, but it's better than silently missing incorrect
usage.
 2012-11-09 14:36:19 +09:00
Bill Currie
49cc4fed0c Give the builtin structures proper tags. 
With the previous commit, the structures were being created before a valid
source file name was available and thus qfcc would segfault when trying to
generate a tag. Now, the tags look better anyway :).
 2012-11-09 14:00:10 +09:00
Bill Currie
9fd8741b4f Move the state clearing into InitData. 
Now, for each compilation, or before linking, only InitData needs to be
called. Fixes the double chaining internal error when compiling and linking
in the same command.
 2012-11-09 13:56:45 +09:00
Bill Currie
f307c7bebc Rework the unary_expr grammar to allow ++*foo. 
This required throwing out the primary rules that snax did up to help me
with conflicts many years ago, but they were now getting in the way. Now
the productions from primary are merged in with unary_expr.
 2012-11-09 12:32:38 +09:00
Bill Currie
6ff2644ab5 Fix simple pointer dereferences. 
It turns out no code was being generated for x = *y. Ouch. I suspect I need
to take a better look at expr_deref at some time in the not too distant
future.

Conflicts:
	tools/qfcc/source/statements.c
 2012-11-09 12:32:35 +09:00
Bill Currie
7a2f7e8982 Add some safety checks to progs global dumping. 
Getting segfaults in the debug tools is not fun :P

Conflicts:
	tools/qfcc/source/dump_globals.c
 2012-11-09 12:30:14 +09:00
Bill Currie
cc24e2e67e Initialize global string vars correctly. 
Ouch, I'd fixed that for arrays, but not normal vars.
 2012-11-09 12:23:04 +09:00
Bill Currie
9095e1eabc Rework build_switch to use initialize_def. 
This required support for label reference expressions, whose purpose is to
represent the address of a label.
 2012-11-09 12:22:34 +09:00
Bill Currie
48fe9f729d Add partial support for pointer arithmetic. 
Only pointer +/- integral is supported. pointer - pointer will come later.
 2012-11-09 12:21:45 +09:00
Bill Currie
afbab60c25 Create linker_find_def. 
It turns out I didn't need it, but it could be useful in the future, so
I'll leave it in.
 2012-11-09 11:57:06 +09:00
Bill Currie
4ef4711c3b Make the type encodings findable. 
The base of the type encodings block is given by the .type_encodings def.
The block begins with a "null" type (4 words of 0), followed by the first
type encoding.

At some stage, I will need to add information for extended def information
(32 bit offset, type encoding, other?), but this is good for initial
testing.
 2012-11-09 11:43:19 +09:00
Bill Currie
1d060d1ac1 Quote string values when dumping globals. 
Much nicer :)
 2012-11-08 21:13:24 +09:00
Bill Currie
eb86a66ce5 Do some class object type renaming. 
type_object -> type_obj_object
type_Class -> type_obj_class
type_ClassPtr -> type_Class

In the process, one more FIXME is gone :)
 2012-11-08 20:58:48 +09:00
Bill Currie
377f8f9d56 Use an explicit flag for class initialization. 
Much cleaner than messing with class_Class, which is about to go away.
 2012-11-08 17:14:33 +09:00
Bill Currie
7e293a38e8 Check for double-chaining of types. 
Chaining a type twice will form a loop in the type list, causing find_type
to go into an infinite loop.
 2012-11-08 17:14:33 +09:00
Bill Currie
950a3aa83d Avoid infinite recursion when encoding struct types. 
Structures (especially hard-coded ones) can be really nasty as they can
refer to themselves. Avoid the recursion by setting the type_def field of
the type before doing the recursive encodings in the structure encoder.
 2012-11-08 17:06:38 +09:00
Bill Currie
7a25283beb Clear out the type encoding def from all types. 
The encodings of static types were getting corrupted because their defs
were not necessarily in the same places between compilations when compiling
multiple files.
 2012-11-08 17:06:38 +09:00
Bill Currie
a3a22f2a1b Add the ability to dump qfo type encoding. 2012-11-08 17:06:38 +09:00
Bill Currie
09d1cd61f3 Don't convert a qfo to progs unnecessarily. 
This avoids segfaults on reloctions for external defs.
 2012-11-08 17:06:29 +09:00
Bill Currie
61ef901254 Tweak some FIXMEs. 2012-11-08 17:03:02 +09:00
Bill Currie
ed4018fd8d Clear out the function overloading tables between compiles. 
Fixes some issues with multiple compiles (especially mixed languages!).
 2012-11-01 20:53:33 +09:00
Bill Currie
ea34a5b753 Fix some nasty memory errors. 
Three cheers for valgrind!!!
 2012-11-01 20:53:28 +09:00
Bill Currie
5c79953a7e Put quotes around strings for statement operands. 
This makes reading output a bit easier (especially if the string is empty
or just whitespace).
 2012-10-30 12:31:28 +09:00
Bill Currie
f8bdd909cc Separate out C and html quoting into separate functions. 
Dot sometimes wants normal C quotes, othertimes html. Quite annoying,
really, but this is cleaner anyway.
 2012-10-30 12:31:22 +09:00
Bill Currie
f680521e0f Escape unprintable chars. 2012-10-27 11:45:51 +09:00
Bill Currie
ec42bde527 Make hash tables more const correct. 
And clean up the resulting mess :/
 2012-10-27 11:44:31 +09:00
Bill Currie
034139b806 Move some code around so it's more accessible. 2012-10-27 11:43:29 +09:00
Bill Currie
7519ec7bbd Fix the bogus missing return warning. 
Pascal's return mechanism is such that void return is always used.
 2012-10-26 20:11:38 +09:00
Bill Currie
3f351a5c88 Fix a printf format goof. 
Forgot to compile test :/
 2012-10-26 19:38:59 +09:00
Bill Currie
52b9721027 Add the COMMA token to the pascal parser. 
I guess I forgot I needed to keep token numbers in sync between pascal and
qc/ruamoko.
 2012-10-26 19:06:10 +09:00
Bill Currie
72045f1a5b Delay storage setting for pascal functions. 
The function def must not be local. This fixes the null function call in
gcd.pas.
 2012-10-26 19:03:00 +09:00
Bill Currie
27b83a8d65 Clean up all extra aborts, using internal_error instead. 
Some internal_error calls have no message, but at least things will be more
consistent.
 2012-10-26 19:02:02 +09:00
Bill Currie
5530e84ada Call find_type for pascal functions/procedures. 
The result of parse_params needs to be passed through find_type before
actually being used. I guess I'd missed this back when I got things working
for qc.
 2012-10-26 16:20:57 +09:00
Bill Currie
f14d8060e0 Merge qfpc into qfcc. 
Since gnu bison and flex are required anyway, no harm in using their api
prefix options. Now, qfcc can compile both QC/Ruamoko and Pascal files
(Pascal is (currently?) NOT supported in progs.src mode), selecting the
language based on the extension: .r, .qc and .c select QC/Ruamoko, .pas and
.p select Pascal, while anything else is treated as an object file (as
before).
 2012-10-26 16:01:41 +09:00
Bill Currie
358ea4ef9a Fall back to execve/wait when execvp and waitpid are unavailable. 2012-08-19 13:18:38 +09:00
Bill Currie
b6125276e4 Fix the mis-handling of the progs.dat line in preprogs.src 
Gah, must have lost a line at some stage. Also, handle line number
directives.
 2012-07-14 19:01:47 +09:00
Bill Currie
7444371162 Disable bolding for special chars. 
If an escape sequence is used to access a char, the the programmer probably
wanted that char, regardless of the current bolding mode.
 2012-07-14 17:47:34 +09:00
Bill Currie
3b8141691e Fix a bunch of continue vs break issues. 2012-07-14 17:26:13 +09:00
Bill Currie
1364bff91b Add an extended mode to qfcc. 
Extended mode allows extra keywords (switch, for, etc) that are compatible
with v6 progs.
 2012-07-14 17:16:33 +09:00
Bill Currie
4055d9a435 Add support for \s escapes to qfcc. 
I guess \s is an fteqcc extention for toggling bold characters. At the
request of freewill.
 2012-07-14 11:47:26 +09:00
Bill Currie
dbc203b625 And a few more bits of whitespace. 2012-05-23 08:21:27 +09:00
Bill Currie
23a38738fc Massive whitespace cleanup. 
Lots of trailing whitespace and otherwise blank lines.
 2012-05-22 08:23:22 +09:00
Bill Currie
0036a5e113 Ensure edict_size is never 0. 
Avoids division by / in NUM_FOR_EDICT
 2012-05-06 21:35:42 +09:00
Bill Currie
1dd5cccda2 Correct some more error messages. 2012-05-06 18:52:05 +09:00
Bill Currie
a0788c6cdf Implement constant folding for unary operators. 
Including conversions between float and int :)
 2012-05-06 18:49:07 +09:00
Bill Currie
f781e9078c Correct some typos in error messages. 2012-05-06 18:43:18 +09:00
Bill Currie
954e03c3f7 Report the correct function name for the largest locals. 
I must have been tired when I adapted that code.

* taniwha dons brown paper bag
 2012-05-06 13:02:11 +09:00
Bill Currie
55ecf94f2d Don't draw arrows leaving return statements. 
Return statements never flow to the next block (or any other block, for
that matter), so drawing arrows leaving them not only messes up dot's
graphs, but is quite missleading.
 2012-05-05 18:04:10 +09:00
Bill Currie
56410ddc58 Prevent merged if/goto losing its way. 
When mering if/goto (ie, if skipping a goto), the rest of the dead code
remover is used to delete the goto. That part of the code unuses the goto's
label. The if was getting the goto's label without the lable's used count
being incremented (the usaged temporarily increases by one). I have no idea
why the problem showed up randomly, but this seems to fix it (it fixes /a/
bug, anyway).
 2012-05-04 22:35:20 +09:00
Bill Currie
953e789db2 Handle movement of the final block. 
Moving a final block caused segfaults and weird flow graph corruptions.
 2012-05-04 19:48:32 +09:00
Bill Currie
e8c17c68e6 Fix a segfault when the switch expression errors. 2012-05-04 18:13:11 +09:00
Bill Currie
5df25133b3 Implement code movement for unconditional jumps. 
That is, when the destination of the jump is reachable via only the jump.
 2012-05-04 18:00:05 +09:00
Bill Currie
33bfac0508 Process all basic blocks for jump threading. 
I'd copied the for loop from the dead block removal code, but jump
threading doesn't need to look at the following block...
 2012-05-04 14:10:30 +09:00
Bill Currie
f169a7732d Factor out label unuse. 
I expect to need this more often in the future.
 2012-05-04 14:01:39 +09:00
Bill Currie
75aa28cfac Mark all subsequent blocks as reachable after if/goto merge. 
If an if/goto merge is done in the first dead block pass, no blocks after
the merge have their rechable flag set because they've never been tested.
 2012-05-04 10:58:18 +09:00
Bill Currie
8ddd58f951 Fix the dropping of the block after the merged if/goto. 
The naive implementation of the if/goto merging was letting the old target
of the if get dropped because the block would lose its label and thus be
judged unreachable because the preceeding goto block was still in the list.
Instead, when the if/goto are "merged", mark the goto block as unreachable,
the following block as reachable, and break out of the analysis loop to
force the removal of the goto block. Since the dead block removal function
loops until no action is taken, all other dead blocks will be removed.
 2012-05-04 10:07:55 +09:00
Bill Currie
e866619de6 Output basic block flow diagrams to files. 
The output can be controlled via --block-dot (not yet documented). The
files a named <sourcefile>.<function>.<stage>.dot. Currently, stage will be
one of "initial" (after expression to statement conversion), "thread"
(after jump threading), "dead" (after dead block removal), "final" (final
state before actual code emission).
 2012-05-04 09:45:51 +09:00
Bill Currie
3da44ace52 Merge if and goto blocks when if only skips over the goto. 2012-05-03 22:21:32 +09:00
Bill Currie
6afdfb5fac Unuse label expressions that are no longer necessary. 2012-05-03 22:20:00 +09:00
Bill Currie
402a578bf8 Add some more helper functions. 
Things were getting messy with the strcmps.
 2012-05-03 22:17:23 +09:00
Bill Currie
88bed3644e Rename some helper functions. 2012-05-03 22:11:52 +09:00
Bill Currie
159f1bafea Add a little more info to statement flow diagrams. 
The relative block number and the label user count are printed now.
 2012-05-03 22:09:49 +09:00
Bill Currie
6900907129 Remove dead labels when jump threading. 
This lets the dead block removal do a better job.
 2012-05-03 19:32:44 +09:00
Bill Currie
ab73a267cd Do not unconditionally remove labels from blocks. 
Labels can be shared between multiple flow-control instructions, so use the
label's used counter to determine when to remove the label. This was
causing problems with the jump threading.
 2012-05-03 19:22:57 +09:00
Bill Currie
c79620f04c Make statement blocks more identifiable. 2012-05-03 19:10:44 +09:00
Bill Currie
43b5edf46b Implement jump threading. 
First real optimization :)
 2012-05-03 17:42:58 +09:00
Bill Currie
78a9ba2557 Make expression alias chains not-a-bug. 
The common cause seems to be casting a cast (very common, and I'm not sure
just realiasing the expression would be right). It does't cause any harm
(particularly, it doesn't trigger alias def chains), so I won't worry about
it.
 2012-05-03 13:57:31 +09:00
Bill Currie
006882407d Fix the source of alias def chains. 
The actual bug might still be elsewhere, but at least now I know the alias
chains were coming from accessing .return and .param_N, which are unions
(not directly usable by the progs engine). Emitting a reference to a union
(or struct) would create an alias def, but an alias expression was created
in the expression tree to simplify return/param access. The double layer
(sometimes 3 or 4) alias isn't really neaded, so rather than layering the
aliases, just re-alias the alaised def.
 2012-05-03 13:28:16 +09:00
Bill Currie
ec98e3e206 Mark alias def chains as a bug. 2012-05-03 13:27:30 +09:00
Bill Currie
5f676c367f Add a non-error diagnostic that can't be silenced. 
It is inteded for flagging buggy conditions in the compiler, particularly
after having fixed the original bug (in case something comes back from the
dead).
 2012-05-03 13:24:24 +09:00
Bill Currie
3306039da2 Print the destination type for alias expression bubbles. 2012-05-03 11:55:19 +09:00
Bill Currie
e267e0a664 Allow control of progdefs.h CRC writing. 
CRC writing defaults to off for non-v6 progs, but on for v6 progs. The
--progdefs option forces CRC writing.
 2012-05-03 00:22:24 +09:00
Bill Currie
44fcd76475 Add some missing command line option docs. 2012-05-03 00:03:13 +09:00
Bill Currie
15de69d868 Use dstring for progdefs.h writing. 
And finally get qfcc into the thing :P
 2012-05-02 23:39:49 +09:00
Bill Currie
04b9b3a11d Fix progdefs.h writing. 2012-05-02 22:44:45 +09:00
Bill Currie
ce278b2fbf Ensure .zero does not get a vector field for v6 progs. 
v6 progs expects .zero to be only 1 word. The code actually tried to keep
vector out of .zero, but it seems I'd rearranged the structure defintion
without updating the code that kills the vector field. Problem spotted by
divVerent.
 2012-05-02 22:29:17 +09:00
Bill Currie
e06ee34287 Allow quat * vec in ruamoko. 2012-04-26 12:00:27 +09:00
Bill Currie
bc1b483525 Nuke the rcsid stuff. 
It's pretty useless in git.
 2012-04-22 10:56:32 +09:00
Bill Currie
eefa89e72e Remove the AM_CONDITIONALs from tools. 
Now that the tools directories aren't entered when those tools aren't being
built, there's no reason to use AM_CONDITIONAL in there.
 2012-02-10 02:50:42 +09:00
Bill Currie
c8163fc0de Add an option to prevent the use of default paths. 
Despair has things locked down such that running qfcc during a build fails
due to lack of read access to /usr/local/lib. This is actually a good
thing as accidentally hitting old includes/libs (when a file gets deleted
in the tree) hides bugs. Thus, --no-default-paths to turn off default
search paths.
 2012-01-04 13:53:04 +09:00
Jeff Teunissen
6ead583195 Ruamoko: Implement infinity. 
The special token __INFINITY__, like __FILE__ and friends, will expand to
a floating-point expression containing a value the C compiler considers
infinite. Obviously, this assumes that the system has relatively modern
float hardware -- but if it doesn't, having Ruamoko be able to represent
float infinity is the least of your problems. :)
 2011-12-14 12:20:10 -05:00
Bill Currie
ea02f3cd44 Fix a missed byteswap when loading qfo files. 2011-11-15 17:36:55 +09:00
Bill Currie
a71acc9ae5 Move the essential init code into Sys_Init(). 2011-09-11 14:56:47 +09:00
Bill Currie
e42c5a4272 More tests and fix vector/quaternion global dumps. 2011-08-11 14:58:13 +09:00
Bill Currie
c6e0e094d8 Fix an unterminated array. 
That was sneaky. It took building qfcc on an arm to trigger that bug.
 2011-07-30 15:01:16 +09:00
Bill Currie
d910c14935 Clean up some doxygen warnings. 2011-07-10 19:12:07 +09:00
Bill Currie
617e70c8e3 Clean up a bunch of bison unused warnings. 2011-06-21 19:52:47 +09:00
Bill Currie
0f7390dd60 Clean up all the "set but not used" warnings. 
gcc on my system is failing to treat this specific warning as an error :/
 2011-06-19 10:48:02 +09:00
Bill Currie
c7612dcd99 Make statement dumps a little more informative. 2011-04-10 09:08:46 +09:00
Bill Currie
fd6e341e06 Clean up cast_expr() a little bit. 2011-04-10 00:29:27 +09:00
Bill Currie
57ed603658 Extract values from constant defs. 2011-04-09 12:42:41 +09:00
Bill Currie
cc714864a8 Support converting to/from unsigned values. 2011-04-09 11:32:33 +09:00
Bill Currie
55cc0f9206 Bring back the unsigned type (PROGS version bump) 
This is only low-level support (the unsigned keyword still does not work),
but sufficient to make switch statements using jump tables work.
 2011-04-09 10:07:47 +09:00
Bill Currie
b522853765 Ensure the target of def_op relocs gets updated. 
These occur only when switch statements use jump tables, thus why the
problem went unnoticed :/
 2011-04-08 17:09:40 +09:00
Bill Currie
237f11c472 Fix cast expressions. 
Casting between ints and floats needs special treatment to get the
conversion operator, but other casts need to be aliases.
 2011-04-08 13:55:26 +09:00
Bill Currie
c4a398850a Fix defs as constants for vectors and quaternions. 2011-04-04 21:31:59 +09:00
Bill Currie
38b25e0c38 Do not double-allocate space for immediates. 
Caused by changed semantics in def creation.
 2011-04-03 13:11:50 +09:00
Bill Currie
92ba110a87 Ensure a field def is emitted for @this. 2011-04-03 13:03:48 +09:00
Bill Currie
7f67e6eb17 Refactor the def handling code a little. 2011-04-03 13:03:22 +09:00
Bill Currie
6d0b13dbf0 Resolve types whenever possible. 2011-04-03 13:02:04 +09:00
Bill Currie
2c9c1bd968 Ensure defs for @self and @this are generated. 2011-04-03 13:00:48 +09:00
Bill Currie
2de7733b6a Fix initialized variable type handling. 
Same problem as initialized constants :P
 2011-03-30 21:21:38 +09:00
Bill Currie
8e18c76bde Make initialized variables defs rather than immediate constants. 2011-03-30 19:58:09 +09:00
Bill Currie
7dbd2ec172 Allow field aliasing. 
Initializing a field variable to another field will set the new field to
point to the same location. No type checking is done.

eg:
.SEL thinkMethod = think;
 2011-03-30 09:33:47 +09:00
Bill Currie
550fff5467 Allow assignments between any field types. 2011-03-30 08:14:17 +09:00
Bill Currie
75c3653be4 Implement some missed relocs. 2011-03-30 08:13:13 +09:00
Bill Currie
1911cc1472 Mingw build fixes. 2011-03-27 08:26:42 +09:00
Bill Currie
896791b209 Correct the spelling of "int" and clean up the mess. 2011-03-25 16:53:04 +09:00
Bill Currie
1617f0765e Support the default type without segfaulting. 2011-03-25 09:59:48 +09:00
Bill Currie
a7cfe3b215 Preserve the current class across protocol defs. 
It seems that protocol defs are allowed in class implementations, so don't
let the protocol def kill the current class for the class implementation.
 2011-03-24 11:55:17 +09:00
Bill Currie
71af121665 Detect missing @end tags. 
Give a warning when @end is forgotten in class implementations.
 2011-03-24 11:44:22 +09:00
Bill Currie
8d3508cf20 Allocate space for temp defs using size rather than type. 
Statement operands throw away the high level type information, so store
type size in the operand and use this size for allocating space for temps
rather than using the low-level type.
 2011-03-23 21:32:14 +09:00
Bill Currie
9b62c8c126 Rename ty_type_e to ty_meta_e and type_t.ty to type_t.meta 2011-03-22 16:06:47 +09:00
Bill Currie
d4be914019 Fix initialized vector variables. 
The whole initialized variable system is wonky, but it will do for now.
 2011-03-22 15:10:06 +09:00
Bill Currie
6a49861b49 Fix the bogus source file for "redefined" functions. 2011-03-22 13:45:44 +09:00
Bill Currie
7dbd5f656c Fix traditional vector component access. 2011-03-22 13:05:42 +09:00
Bill Currie
f1d9570dc8 Fix constant value type handling. 
Rename immediate.[ch] to value.[ch] and clean up the mess.

Add convert_value() to convert the type of a value (only scalar types).
 2011-03-22 12:24:39 +09:00
Bill Currie
1219df0872 Fix field immediates. 
Field immediates need to be treated the same way as pointer immediates when
merging values.
 2011-03-21 18:11:46 +09:00
Bill Currie
46093c0937 Use the correct meta type for spacial types. 
Although vector and quaternion types have symbol tables, they are not
really structs, so set the meta type to "none", allowing the types to be
encoded correctly.
 2011-03-21 17:26:49 +09:00
Bill Currie
cefe7e2e94 Use the correct source of defs for field defs. 2011-03-21 17:07:40 +09:00
Bill Currie
0c0f4360da Make field defs "nosave". 
The engine treats fielddefs with DEF_SAVEGLOBAL set as bogus.
 2011-03-21 17:06:45 +09:00
Bill Currie
f5ce9e2004 Fix a merge induced error in overloaded functions. 2011-03-20 19:04:18 +09:00
Bill Currie
1ada2a96cf Merge branch 'master' into qfcc-codegen 
Conflicts:
	tools/qfcc/source/expr.c
	tools/qfcc/source/function.c
	tools/qwaq/test.r
 2011-03-20 15:58:31 +09:00
Bill Currie
a919e5f619 Make class_check_ivars() use class_add_ivars() to add the ivars. 
This avoids implementation ivar blocks trashing the ivar offsets in
derived classes.
 2011-03-20 13:35:59 +09:00
Bill Currie
8c8a6a4d63 The function return type is the address of the type descriptor... 2011-03-17 20:31:20 +09:00
Bill Currie
01144d23cf Add a new gcc warning option and fix the two bugs it found. 2011-03-17 19:58:56 +09:00
Bill Currie
5aa0b34570 Add the cast statement to the statement block. 
*sob*
 2011-03-10 20:43:53 +09:00
Bill Currie
f663f587fe Fix the missing local defs for builtin functions. 2011-03-10 20:16:35 +09:00
Bill Currie
899af3119b Use the correct type when generating a move expression. 2011-03-10 19:30:21 +09:00
Bill Currie
2129eaaf20 Dereference moves need movepi rather than movei. 2011-03-10 19:29:23 +09:00
Bill Currie
cbbbf87e20 Resurrect the stats output. 2011-03-09 15:51:17 +09:00
Bill Currie
8368f57fbf Close a potential buffer overflow. 2011-03-09 11:09:46 +09:00
Bill Currie
4d90eba2ad Remove some unused globals. 2011-03-09 11:08:30 +09:00
Bill Currie
2464a89d37 Preserve relocs across def churning. 
Freeing then re-allocating a def to change its storage from external is
really not the right way to do it, but for now this fixes the loss of the
relocs. With this, the menus seem to work :)
 2011-03-09 10:52:29 +09:00
Bill Currie
39278ba8cc Explicitly select between direct and indirect moves. 2011-03-09 10:30:57 +09:00
Bill Currie
b95cdc33d9 Set instace_size to the correct size. 2011-03-08 22:45:34 +09:00
Bill Currie
55eed1ae07 Make module dumping a little more informative. 2011-03-08 22:43:53 +09:00
Bill Currie
7c770b75c5 Do not creat field defs for local storage. 
This prevents field params and local vars from messing up the real field
defs.
 2011-03-08 19:56:02 +09:00
Bill Currie
f66e20db17 Set the dereferenced type in the field value. 2011-03-08 19:29:36 +09:00
Bill Currie
7198be5726 Treat entities a bit like structures in field_expr (). 
Look in the entity field symbol table for the field before looking in the
normal symbol table. This allows entity fields to be accessed even when
the current scope has symbol of the same name. However, checking the
normal symbol table where there is no such field allows for field
variables when I get around to implementing them.
 2011-03-08 19:28:11 +09:00
Bill Currie
505bde308e Fix the handling of @system defs. 
When treating a def as external, actually say it is external.
 2011-03-07 20:53:27 +09:00
Bill Currie
8dbf8a97ea Be more informative with ext/def internal errors. 2011-03-07 20:52:31 +09:00
Bill Currie
6312ccba81 Fix storage class blocks. 
@extern { defs }; etc
 2011-03-07 20:51:51 +09:00
Bill Currie
4db8ebb6af Support qcc style local function variables. 2011-03-07 20:04:05 +09:00
Bill Currie
853cc53d0f FIx the handling of storage class. 2011-03-07 17:49:01 +09:00
Bill Currie
7649549de6 Handle external field declarations. 2011-03-07 17:23:52 +09:00
Bill Currie
49e446b637 Make field defs global. 
It turns out that field defs need to be global after all, so use separate
field def tables in the linker.
 2011-03-07 14:45:50 +09:00
Bill Currie
041c5d53b8 Check for the vector being a constant before trying to get its value. 2011-03-07 14:04:36 +09:00
Bill Currie
c069bafad8 Support casting from enum to float. 2011-03-07 14:04:05 +09:00
Bill Currie
5a78758781 Support return in void functions in v6 code. 2011-03-07 13:52:28 +09:00
Bill Currie
1246fd9e30 Use the correct size when growing a data space. 2011-03-07 13:36:00 +09:00
Bill Currie
02a70ebe1c Remove the auxfunction manipulation from the compiler proper. 
It was broken code in the first place (realloc and pointers), and is
redundant with the new linking process.
 2011-03-07 13:33:02 +09:00
Bill Currie
16103f9018 Fix param mangling for qc style functions. 2011-03-07 10:43:38 +09:00
Bill Currie
29cac0fe3a Optionally create *_[xyz] symbols for accessing vector components. 
"vector-components" in code options controls this feature. The default is
off for advanced code and on for traditional code. Disabling
vector-components prevents the comonent names polluting the namespace and
reduces the number of globals needed for vector fields if the components
of that field are never used.
 2011-03-07 10:21:40 +09:00
Bill Currie
0b3d0011c5 Implement vector and quaternion component access. 2011-03-07 10:02:20 +09:00
Bill Currie
f0e47f2334 Clean up some code duplication. 2011-03-07 10:01:21 +09:00
Bill Currie
a6f222106e Fix taking the address of normal variables. 
Treat them the same as structure variables.
 2011-03-07 09:58:51 +09:00
Bill Currie
3c1784d46c Fold constants on both sides of = to ensure correct expression types. 2011-03-07 08:33:30 +09:00
Bill Currie
66447df6b3 Undo the offset relocation of local defs. 
The debug info expects local defs to be 0 based, so once relocations in
the progs data have been completed, undo the local def offset relocation
so that the correct offsets will be written to the debug info.
 2011-03-06 21:05:25 +09:00
Bill Currie
b2f0c9a127 Dump the local defs for functions when debug info is available. 2011-03-06 21:03:12 +09:00
Bill Currie
b49d90e769 Do not lose the block expression when taking its address. 2011-03-06 16:32:51 +09:00
Bill Currie
c78d15b331 Support taking the address of block expressions that have a result. 2011-03-06 16:05:38 +09:00
Bill Currie
993d05b3d3 Support taking the address of alias expressions. 
Taking the address of an alias expression undoes the alias but uses the
aliased type.
 2011-03-06 15:58:49 +09:00
Bill Currie
b74c644a10 Perform offset field relocations. 2011-03-06 15:41:38 +09:00
Bill Currie
8712d30d1a Make entity field defs static. 
Entity field defs need to be static in order to avoid clashing with their
field variables.
 2011-03-06 15:41:15 +09:00
Bill Currie
c4e9a45d91 Do not lose the entity field defs. 2011-03-06 15:40:07 +09:00
Bill Currie
b7aa2f6786 Support access to struct fields in a structure in an entity. 2011-03-06 15:39:27 +09:00
Bill Currie
fe3d228658 Maintain a symbol table for entity fields. 2011-03-06 15:38:19 +09:00
Bill Currie
c29e0250e4 Make def_field_Ofs reloc dumps more informative. 2011-03-06 15:34:53 +09:00
Bill Currie
02766f0795 Do not try to dump def values from spaces with no data. 2011-03-06 15:33:53 +09:00
Bill Currie
1eb759bb8a Update reloc_names. 
I really need to get reloc_names unduplicated.
 2011-03-06 15:33:10 +09:00
Bill Currie
d1187f0857 Set the edict area size when dumping qfo files. 2011-03-06 13:41:00 +09:00
Bill Currie
7bfaf107ce Set the output file name as early as possible. 2011-03-06 13:40:24 +09:00
Bill Currie
417d1b4442 Fix structure copy into and out of entities. 2011-03-06 13:19:20 +09:00
Bill Currie
dc7a78b2ff Fix case label type conversions. 
The previous method made too many assumptions.
 2011-03-06 11:41:01 +09:00
Bill Currie
fe4df03896 Add is_float (). 
For now, it checks just floats, but I might one day add doubles.
 2011-03-06 11:35:15 +09:00
Bill Currie
85bffbcad0 Add is_integral() to check for integral types (integer, short, enum). 2011-03-06 11:25:12 +09:00
Bill Currie
17a9dff769 Avoid freeing an operand twice. 
Due to the way operands are used, they can be freed twice in dead-statement
removal. Detect the double-free and ignore it.
 2011-03-06 11:19:09 +09:00
Bill Currie
28f4de94d2 Fix switch statements so the work in the new scheme. 
Convert case labels to be the same type as the switch expression.
Use alias expressions for the various test expressions.
 2011-03-06 00:29:29 +09:00
Bill Currie
8cfa80b5d4 Implement think expressions. 2011-03-05 18:01:37 +09:00
Bill Currie
7209c61912 Fix initializing local float variables with an integer constant. 
Run the assignment expression through fold_constants to handle any
necessary conversions and error checking.
 2011-03-05 17:23:58 +09:00
Bill Currie
a3c1f339fc Gracefully handle undefined symbols in entity field expressions. 2011-03-05 17:22:04 +09:00
Bill Currie
7314b944d5 Bring back the offset alias support. 
Accidently nuked it when fixing .return etc.
 2011-03-05 16:31:32 +09:00
Bill Currie
e7e8220246 Dump code addresses as hex, too. 2011-03-05 16:25:56 +09:00
Bill Currie
2f74e6e4bf Nuke the old progs global. 
It is no longer needed thanks to the new qfo conversion functions.
 2011-03-05 16:24:53 +09:00
Bill Currie
fcb567fc98 Use the correct function number when updating the function def. 
Functions are 1 based in progs bug 0 based in qfo files.
 2011-03-05 16:00:39 +09:00
Bill Currie
535dfad305 Emit defs for far data. 
They will break when the offsets exceed 64k, but they are needed for
debugging.
 2011-03-05 15:59:14 +09:00
Bill Currie
97b1ceceb0 Fix line number info. 
line number info is now 1 based rather than 0 based (to better detect when
a function does not have line number info).
 2011-03-05 15:40:08 +09:00
Bill Currie
1dea86a3e4 Update debug info loading when dumping qfo files. 2011-03-05 14:53:41 +09:00
Bill Currie
cfefd79e07 Fix the source of bogus string relocs. 
Nested aggregate initializers were corrupting themselves.
 2011-03-05 09:21:12 +09:00
Bill Currie
7c95913c61 Avoid segfaulting with bad string relocs. 2011-03-05 09:07:16 +09:00
Bill Currie
8eb5fd653a Perform the relocations!!! 
line numbers seem to be broken, but the code itself looks good.
 2011-03-05 08:41:14 +09:00
Bill Currie
fe7be543f8 Correctly update the offset of code relocs. 2011-03-05 08:39:47 +09:00
Bill Currie
7fd839a5ed Handle chains of alias defs so relocs will be emitted. 2011-03-05 08:39:16 +09:00
Bill Currie
bbedbf5c9c Add the .return etc symbols to the symbol table. 
This puts their defs into the object file.
 2011-03-05 08:37:51 +09:00
Bill Currie
c3f1c186f8 Resolve types of .return etc. 2011-03-05 08:36:55 +09:00
Bill Currie
af7bc81e16 Chain the types for the linker. 2011-03-05 08:35:56 +09:00
Bill Currie
0bd0f783b2 Update def offsets with their final locations. 2011-03-04 23:37:46 +09:00
Bill Currie
6d02555ca9 Reorganize the offset calculations. 
keep the offset calculations separate from the data transfers for better
clarity in what is happening.
 2011-03-04 23:31:09 +09:00
Bill Currie
e62163e569 Nuke any invalidated relocs. 2011-03-04 21:46:19 +09:00
Bill Currie
2565e0db32 Update reloc targets when linking. 2011-03-04 21:29:47 +09:00
Bill Currie
bc78b84869 Set the target of string relocs to the string index. 2011-03-04 21:29:10 +09:00
Bill Currie
e04f6266b1 Nuke def_list from defref_t. 
It didn't work :/.
 2011-03-04 20:40:01 +09:00
Bill Currie
5a552d8841 Add the null function. 2011-03-04 20:29:40 +09:00
Bill Currie
368a3826be Redo the offset and size calculations for qfo_to_progs(). 2011-03-04 20:14:02 +09:00
Bill Currie
cd12a78f93 Replace some accidentally deleted code. 
Forgot to commit it the first time round, then rebase messed me up and I
didn't notice until after pushing. *sigh*
 2011-03-04 19:02:47 +09:00
Bill Currie
72fae608e5 Write the function start address to the progs file. 
Oops:P
 2011-03-04 18:46:28 +09:00
Bill Currie
2211a807d4 Do not relocate builtin functions. 2011-03-04 18:46:25 +09:00
Bill Currie
d6d8b5b49d Generate the debug symbol file. 2011-03-04 18:46:05 +09:00
Bill Currie
9a96febdf5 Fix the hordes of bogus defs. 
They were caused by unused external defs, so not processing unused externs
in the first place is the simplest solution.
 2011-03-04 14:51:09 +09:00
Bill Currie
7b7f4c70e0 Correct non-external def processing. 2011-03-04 14:33:03 +09:00
Bill Currie
c5dac6d1d1 Transfer the type encoding. 
oops
 2011-03-04 14:29:22 +09:00
Bill Currie
d0b4546383 qfprogs isn't yet fully functional... 2011-03-04 13:54:29 +09:00
Bill Currie
2992d66f87 Simplify the tag used for anonymous structs etc. 
Hopefully two files with the same file name won't have anonymous stucts on
the same line.
 2011-03-04 13:52:32 +09:00
Bill Currie
e525727a24 Add a null type descriptor to the linker output. 2011-03-04 11:38:33 +09:00
Bill Currie
3a828ca5c2 Ensure work spaces are always connected to their data. 2011-03-04 11:18:56 +09:00
Bill Currie
4192ef835c Delay initialization of obj_module_t as long as possible. 
This keeps the type descriptor out of progs that never use any
Objective-QC features.
 2011-03-04 08:25:50 +09:00
Bill Currie
ee9045c377 Emit code for jump tables. 
With this, the entirety of the ruamoko tree builds (though the progs will
be broken in various ways: mostly unrelocated references).
 2011-03-03 19:09:00 +09:00
Bill Currie
a281033920 Alais the jump table's array to an integer. 
As per the previous commit, I'm not sure this is the right thing to do, but
it works for now.
 2011-03-03 19:07:37 +09:00
Bill Currie
4324486ae6 Give - unary expressions special treatment. 
The progs engine has no neg instruction, so need to implement -val as
nil - val
 2011-03-03 18:13:30 +09:00
Bill Currie
f9e177efd6 Obtain the label to be removed from the correct place. 
This fixes the undetected dead block after "if return else return".
 2011-03-03 17:50:46 +09:00
Bill Currie
ed901bd48f Drop unused labels rather than adding them to the statement block. 
However, even unused labels create a new statement block if necessary.
 2011-03-03 17:35:06 +09:00
Bill Currie
b5e7e666e9 Fix some missed branch/goto expression changes. 2011-03-03 17:33:53 +09:00
Bill Currie
c5ecc170b6 Give labels a usage count to detect unused labels. 2011-03-03 15:28:49 +09:00
Bill Currie
90640614ef Compare symbols using the right method. 
That fixme was right :)
 2011-03-03 15:02:26 +09:00
Bill Currie
610d775bd1 Treat void values as the largest type. 
This fixes passing nil through a structure return value.
 2011-03-03 14:56:21 +09:00
Bill Currie
bad5fddec4 Fix overloaded function resolution. 
Update the expression symbol pointer, not just the symbol name.
 2011-03-03 14:44:48 +09:00
Bill Currie
fff4fc693e Fix value hashing and comparison in switch expressions. 2011-03-03 14:02:18 +09:00
Bill Currie
74e6b13aee Use alias expressions where possible when testing an expression. 2011-03-03 13:47:28 +09:00
Bill Currie
d937172243 Create and use alias operands for alias expressions. 
This avoids the alias expression modifying the operand used in other
expressions.
 2011-03-03 13:46:07 +09:00
Bill Currie
022fde666f Implement unary expression statements. 2011-03-03 13:10:07 +09:00
Bill Currie
45de7327dc Implement alias expressions (finally). 
Alias expressions are like cast expressions, but never do any conversions.
 2011-03-03 11:06:10 +09:00
Bill Currie
848994323e Support enums in expressions that support scalar types. 2011-03-03 10:36:43 +09:00
Bill Currie
c12211d8bb Support enum results for boolean expressions. 
eg enum BOOL x = a && b;
 2011-03-02 22:46:55 +09:00
Bill Currie
c06dd776d2 Fix expression initializers for arrays and structs. 2011-03-02 22:28:17 +09:00
Bill Currie
76f912c7a1 Fix function typedefs. 2011-03-02 22:23:24 +09:00
Bill Currie
aa4ed00090 Fix the message type used to check arguments. 2011-03-02 22:13:16 +09:00
Bill Currie
4a99f8dcbd Write the linker output to progs.dat. 
There is much breakage, but qfcc now produces a progs.dat from either
progs.src or object files. Better yet, the progs.src result is passed
through the linker, removing much duplicate code.
 2011-03-02 20:51:00 +09:00
Bill Currie
29985efcef Expose some linker functions to the rest of the compiler. 
They proved to be useful for cleaning up the final compilation stages.
 2011-03-02 20:48:55 +09:00
Bill Currie
8cdd28f534 Use qfo_to_progs() for dumping qfo data. 
Yay, less duplicate code, and better yet, qfo_to_progs gets some much
needed testing :).
 2011-03-02 19:08:11 +09:00
Bill Currie
ecb995a8f7 Rewrite qfo_to_progs() to go direct from qfo to progs.dat. 
Relocs and debug info is currently broken.
 2011-03-02 19:06:43 +09:00
Bill Currie
824d8bfc3c Remove some now unnecessary functions. 2011-03-02 14:21:20 +09:00
Bill Currie
065d3e0dd7 Partial linking for a single qfo file now seems to work. 2011-03-02 14:03:41 +09:00
Bill Currie
bfeece3255 Fix the bogus declarations of obj_msgSend and obj_msgSend_super. 2011-03-02 12:35:10 +09:00
Bill Currie
fda46a4aca Handle the special defs. 2011-03-02 12:26:53 +09:00
Bill Currie
330e76a9ac Set the correct storage class for struct and enum specifiers. 2011-03-02 11:29:08 +09:00
Bill Currie
54317965cc Handle relocs. 
With this, the building of the work qfo seems to be almost finished, just
the special defs to go. Next step will be to stitch all the parts of the
work qfo into a real qfo.

However, still have to fix the relocs for the type descriptors, but they
are not critical to the linker's functioning.
 2011-03-02 11:16:35 +09:00
Bill Currie
8669dc373f Add some documentation. 2011-03-02 11:13:44 +09:00
Bill Currie
65bd215058 Minor rearrangements. 2011-03-01 15:35:14 +09:00
Bill Currie
2cb1c74718 More progress on the linker. 
Need to finish up defs and handle relocs, and then take care of special
defs (@self etc), but things are getting very close.
 2011-03-01 15:18:47 +09:00
Bill Currie
b584a22d6b Fix external function declarations. 
Use spec.storage rather than current_storage.
 2011-03-01 11:08:33 +09:00
Bill Currie
cce6838e16 Ensure .ctor is declared static. 2011-03-01 11:08:32 +09:00
Bill Currie
c36919aae7 Fix verbosity and diagnostic messages. 2011-03-01 11:08:32 +09:00
Bill Currie
cfff2b1037 Add defs from near and far data spaces. 2011-03-01 10:52:27 +09:00
Bill Currie
21558864b9 Make defrefs a little more stupid. 
Stupid code does little well :P

I forgot that spaces get realloced, and I don't remember why I had the def
list pointer separate anyway.
 2011-03-01 09:19:04 +09:00
Bill Currie
1416b996d3 Ensure the type space pointer is cleared with each object file. 2011-03-01 09:18:09 +09:00
Bill Currie
30272968c9 Update the def's type pointer. 2011-03-01 09:17:32 +09:00
Bill Currie
1837518d05 Split the space processing into two passes. 
This allows strings and types to be handled before code and data.
 2011-03-01 08:48:58 +09:00
Bill Currie
eb11a19ed4 Split the type processing into two passes. 
This allows all duplicate types to be "merged" before adding any new
types, thus avoiding any accidental duplication caused by possible
differences in order between defs and the type descriptors.
 2011-03-01 08:46:02 +09:00
Bill Currie
05e6f00e72 Initialize the new type def. 
Oops :P
 2011-03-01 08:16:14 +09:00
Bill Currie
3761cddca6 Finally, some real progress on the linker. 
There is still much to be done, but this seems to be a workable approach.
 2011-02-28 23:18:07 +09:00
Bill Currie
bad7078797 Don't set the space defs pointer if there are no defs. 2011-02-28 23:16:59 +09:00
Bill Currie
5d9fbc2d6d Set the space ids to the destination space. 
This is mostly redundant, but it allows qfo spaces to get out of order
without breaking everything.
 2011-02-28 23:16:19 +09:00
Bill Currie
b544196c21 Change ptrfld to fldptr for consistency with type.h. 2011-02-28 23:12:32 +09:00
Bill Currie
8b661bbb89 Rename qfo_reloc_t's def to target and correct its usage. 2011-02-27 11:37:24 +09:00
Bill Currie
c8f1b5b1f0 Fix the missing type encoding for structures. 
There should be a better way (probably by doing the encoding as needed
rather than in chain_type), but this seems to work for now.
 2011-02-27 00:39:40 +09:00
Bill Currie
438d14d852 More or less fix qfprogs when dumping info from qfo files. 
Relocations are still broken, but everything seems to be working and
qfprogs now seems to be generally usable.
 2011-02-27 00:36:45 +09:00
Bill Currie
4f6d18a328 Encode the basic type for functions, fields and pointers. 
Very important for distinguishing them from other types.
 2011-02-27 00:33:16 +09:00
Bill Currie
9cf63dbbdf Clean up the create of the obj_module_s structure. 2011-02-26 22:06:22 +09:00
Bill Currie
cbfbc0b01a Ensure type_ClassPtr is chained before it is used. 2011-02-26 22:05:53 +09:00
Bill Currie
a7ae71efad Fix some type encoding problems found using qfprogs. 2011-02-25 15:59:23 +09:00
Bill Currie
58ac212b54 Fix qfo function dumping. 2011-02-25 13:37:23 +09:00
Bill Currie
2b3436beed Fix qfo reloc dumping. 2011-02-25 13:29:09 +09:00
Bill Currie
f43eda63fe Fix qfo global dumping. 2011-02-25 09:39:07 +09:00
Bill Currie
f362e74f98 Update the header. 2011-02-24 15:24:35 +09:00
Bill Currie
a106c1fb51 Add a field for loose relocation records. 
Loose relocation records are those that are not bound to a def or a
function.
 2011-02-24 15:21:06 +09:00
Bill Currie
8f1e2c143a Clean up some fixmes. 2011-02-24 14:08:42 +09:00
Bill Currie
c10a551c84 Rename new_defspace() and defspace_new_loc(). 2011-02-24 13:07:36 +09:00
Bill Currie
88cd37a3e2 Header update for the renamed files. 2011-02-24 13:00:19 +09:00
Bill Currie
5efeb7ebf8 Rename some files that have been bugging me. 2011-02-24 12:59:18 +09:00
Bill Currie
66b255afbf First stage of the linker rewrite. 
Strings, code and data spaces are "merged". Various offsets are updated.
Still to do:
 o  Merge reloc, def, function and line data.
 o  Merge type data.
 o  Update def and function type pointers.
 o  Resolve external defs and check for duplicate defs.
 o  Perform relocations.
 o  anything else I've forgotten :)
 2011-02-24 12:18:35 +09:00
Bill Currie
74497f00e1 Read qfo object files :) 2011-02-23 18:10:38 +09:00
Bill Currie
33810e9c91 Write out object files in the new format. 2011-02-23 15:05:33 +09:00
Bill Currie
1f7c39b918 Chain @va_list's type. 
Oops :P
 2011-02-23 14:49:00 +09:00
Bill Currie
a1ea492889 Remove some redundant fields from qfo objects. 2011-02-23 10:40:35 +09:00
Bill Currie
c585a17db9 Give type data a null pointer. 
Pointers to the void type descriptor looked just like null pointers and
that was terribly confusing. Avoid that confusion by pre-allocating a
small amount of data in order to reserve space for a null descriptor.
 2011-02-23 08:08:26 +09:00
Bill Currie
e68e6d0858 Create defs for entity fields in the entity space. 2011-02-22 15:43:15 +09:00
Bill Currie
e1158a83f0 Begin work on rewriting obj_file.c for the new format. 2011-02-22 15:42:49 +09:00
Bill Currie
64cf07351f Encode types to string and qfo representation on creation. 2011-02-22 13:36:16 +09:00
Bill Currie
b50b392746 Fix field def allocation for function fields. 
Assignment of nil to a field function is permitted, but trying to use one
as a builtin or as a normal function is treated as an error.
.void (float y) func;       OK
.void (float y) bi = #0;    error
.void (float y) ni = nil;   OK
.void (float y) co = { };   error
 2011-02-22 12:07:31 +09:00
Bill Currie
7d1f2c4ef3 Fix field def allocation for non-function fields. 2011-02-22 10:43:35 +09:00
Bill Currie
b7c6c4af5d Better variable naming in init_elements(). 2011-02-22 09:22:04 +09:00