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

1801 commits

Author SHA1 Message Date
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
7fb22bd1e4 Make D_STRING() more useful and add D_GETSTR() 2011-03-04 21:28:12 +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
45c3dd67a8 Some test updates. 2011-03-04 08:27:26 +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
c99f3aba0e Add the new header files for make dist. 2011-03-04 00:11:13 +09:00
Bill Currie
fd24524e13 More tests. 
I really need to sort out some test automation.
 2011-03-03 22:32:22 +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
9f126ed805 Add some quick type access macros. 2011-03-01 15:18:12 +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
55043310fc Fix the QFO_POINTER macro 2011-02-27 00:31:52 +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
65c7d421c6 Update the qfo access macros for the new format. 2011-02-25 09:38:22 +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
a07cd17f38 Update TODO. 
Remove old entries and add some new ones.
 2011-02-22 12:23:00 +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
ecbb904d6b More docs and clearer types. 2011-02-22 09:23:04 +09:00
Bill Currie
b7c6c4af5d Better variable naming in init_elements(). 2011-02-22 09:22:04 +09:00
Bill Currie
497db3ac81 Fix the return symbol extraction when appending a return statement. 
The code is still icky, though :P
 2011-02-22 09:20:52 +09:00
Bill Currie
4fd6bdae6f Allow nil to be assigned to field variables. 
Note, this is the field variable itself, not the field in the entity.
eg:
	.integer x = nil;
 2011-02-22 09:19:01 +09:00
Bill Currie
87b240f469 Use special treatment for .float ()foo; functions. 
The parser wants to treat .float () foo; as a function returning a float
field, but qcc treats it as a field holding a function variable.
Fortuantely, field types are always "simple" (ie, at worst, just more
field type wrappers around the non-field type), so all that's needed to
obtain qcc grammar is to reach into the field type layers and do the
function type calculation based on the non-field type found there.
 2011-02-22 08:54:01 +09:00
Bill Currie
96c6b31c66 Update qfo version and correct some comments and types. 2011-02-21 18:24:34 +09:00
Bill Currie
4c11304c8d Documentation tweaks. 2011-02-21 08:41:03 +09:00
Bill Currie
bffc1dd239 Clean up objective-qc type encoding. 
Structures etc now never encode the fields as well (I might revert that
at some time). Type parsing has been removed: it has proven unnecessary
and overly complicated, and the new qfo encoding should be more useful.
 2011-02-18 20:51:04 +09:00
Bill Currie
41523852cd Cleaner def and string emittion for types. 
Use local defines for emitting defs and strings as everything goes to the
same locations.
 2011-02-18 12:44:11 +09:00
Bill Currie
7251bc91fa Enhanced type encoding. 
This creates a compact representation of types as seen by qfcc. This is
intended mainly for debuggers.
 2011-02-18 09:06:05 +09:00
Bill Currie
0f0ed3dae2 Allow null types in defs again. 
However, only at the lowest level. This is needed for my type encoding.
 2011-02-18 09:04:33 +09:00
Bill Currie
bceb98e5a4 Create structures for new qfo format. 
This breaks a lot of existing code, so that code has been commented out
for now.
 2011-02-17 15:02:09 +09:00
Bill Currie
9c9a71f1af Allow defs to specify use of offset relocations. 
Access to struct fields in near data can be done using only one operand,
but offset relocs need to be used. However, as not all defs want offset
relocs, a flag has been added to the def struct.
 2011-02-15 22:55:15 +09:00
Bill Currie
d04865884f Set the method's function pointer. 2011-02-15 22:27:13 +09:00
Bill Currie
3721b2edca Method lists are made of methods, not integers :P 2011-02-15 22:26:44 +09:00
Bill Currie
c068138d91 More addresses in hex. 2011-02-15 22:26:09 +09:00
Bill Currie
814e36d3c8 Correct an error message and tidy some code. 2011-02-15 22:25:40 +09:00
Bill Currie
4336fc2c73 Move method function defs into the far data space. 
As they are never referenced directly by instructions, there's no need for
them to be in the near data space, taking precious def locations.
 2011-02-15 15:33:18 +09:00
Bill Currie
5252d72856 Correct the type for _OBJ_SELECTOR_TABLE. 2011-02-15 15:33:12 +09:00
Bill Currie
b3da6ef3d4 Allow zero size arrays to match sized arrays of the same type. 
This allows externally declared arrays to not specify a size.
 2011-02-15 12:08:03 +09:00
Bill Currie
b2d4aee61e Reimplement selector expressions to work with far data. 
They currently execute a lea instruction every method call, but the
optimizer should take care of that once its written.
 2011-02-15 10:48:05 +09:00
Bill Currie
6bd63f811f Preserve any relocs when converting a def from extern to otherwise. 2011-02-15 10:47:16 +09:00
Bill Currie
62456dc1e9 Yet another test. 2011-02-15 09:48:10 +09:00
Bill Currie
4e86b28b59 Use the def type rather than expression type to select the init method. 
Local defs may be initialized with non-constant expressions, which
includes function calls. Both function calls and aggregate initializers
use block expressions.
 2011-02-15 09:38:44 +09:00
Bill Currie
19f6faf0ad Fix aggregate initializers. 
Initializing arrays and structs seems to be working.
 2011-02-15 09:30:37 +09:00
Bill Currie
d162838299 Resurrect constant_expr(). 2011-02-15 09:28:27 +09:00
Bill Currie
bc882ddc3c Fix the parser side of aggregate initializers. 2011-02-14 23:31:37 +09:00
Bill Currie
09af401f0c Reset current_func at the end of each function. 2011-02-14 23:10:46 +09:00
Bill Currie
5fa349927f Preserve the ivars inheritance chain across build_struct(). 
build_struct() unlinks the structure symbol table from its parent, but
that breaks the ivar inheritance chain.
 2011-02-14 23:10:46 +09:00
Bill Currie
5707888fcf Fix some error-recovery segfaults. 2011-02-14 23:10:46 +09:00
Bill Currie
f1fccb19dd Allow same-type re-declarations of uninitialized variables. 
This is especially important for declaring variables that were previously
declared external.
 2011-02-14 23:10:46 +09:00
Bill Currie
b3d5789377 More tests. 2011-02-14 23:10:46 +09:00
Bill Currie
23b01be214 Handle invalid initializers gracefully. 2011-02-14 23:10:46 +09:00
Bill Currie
4c63a0bad6 Generate a warning when creating a var with no type. 
This makes the internal error in new_def() non-functional, but the warning
will catch the bug and there's no harm in leaving the test in new_def().
 2011-02-14 23:10:46 +09:00
Bill Currie
ee866ae3a6 Enable the small struct optimization. 
For now, anyway. It would probably be much better to handle this sort of
thing in the optimizer stage.
 2011-02-14 23:10:45 +09:00
Bill Currie
bcaf3687c5 Fix loading structs into params via an offset pointer. 
For certain values of "fix" :/. The code is ugly, but it does the right
thing: calculate the effect address and use the resulting pointer in a
move instruction.
 2011-02-14 23:10:45 +09:00
Bill Currie
352be1f8bd Handle null string pointers. 2011-02-14 23:10:45 +09:00
Bill Currie
e10d561459 Treat small structs as integers (disabled). 
This is more to stash away a potential optimization. I need to fix the
real problem first.
 2011-02-14 23:10:45 +09:00
Bill Currie
6b29568fa9 Set the source file and line when copying an expression. 
This fixes the crazy line numbers in the debug info.
 2011-02-14 23:10:45 +09:00
Bill Currie
fc18ebd923 Add the source line number to most node labels. 2011-02-14 23:10:45 +09:00
Bill Currie
3e5989463f Update the def_tail when removing the last def from the space. 2011-02-14 23:10:45 +09:00
Bill Currie
11485556e5 Quote expression names to avoid problems with null pointers. 2011-02-14 23:10:45 +09:00
Bill Currie
c139099294 Put another bandaid on the type creation system. 
It seems that building types is very fragile: all too easy to fix things
in one place and break something somewhere else. I guess the type system
will need a comlete rewrite at some stage.
 2011-02-14 23:10:45 +09:00
Bill Currie
e3325b199e More tests. 2011-02-14 23:10:45 +09:00
Bill Currie
e0d61705b4 And fix build_struct for built-in struct types. 
The previous fix broke builtin structs (eg, @param). Calling find_type()
for built-in structs has proven to be a bad idea :)
 2011-02-13 21:07:22 +09:00
Bill Currie
a19b7ec8f9 Make struct decls actually work. 
find_type() does type comparisons based on tag name for struct/union/enum
but when it returns the previous tag (eg, from "struct foo;") the returned
type has a null symtab pointer, so setting the symtab pointer in the type
before calling find_type() only throws away the symtab. Thus, since
find_type() doesn't check the symtab pointer when comparing the types, set
the symtab pointer after calling find_type().
 2011-02-13 20:56:12 +09:00
Bill Currie
acced90101 Create the symbol for the struct as early as possible. 2011-02-13 20:55:33 +09:00
Bill Currie
b545f72f93 Report errors for incomplete types and missing fields. 2011-02-13 20:23:08 +09:00
Bill Currie
c336aaeb80 Handle incomplete types gracefully. 2011-02-13 19:26:20 +09:00
Bill Currie
ef32d1fb6d Save away some of my tests. 2011-02-13 19:02:39 +09:00
Bill Currie
976ff8a6bb Allow cast expressions to be lvalues. 
These really need to be alias expressions rather than cast expressions
so the two can be separated as cast expressions should not be lvalues.
 2011-02-13 17:54:15 +09:00
Bill Currie
fa742ceed6 Handle @self and @this correctly. 2011-02-13 17:52:19 +09:00
Bill Currie
547f361bd3 Allow (void) qc-style functions. 2011-02-13 17:37:11 +09:00
Bill Currie
d75c35ba30 Allow qc style function params. 
Due to ambiguities in the grammar, qc-style function params and c-style
function params had to be completely separated. This means that qc-style
functions can not use pointers and must use qc-style function declarations
for parameters, and c-style functions must use c-style param declarations.
While this rule is tedious for converting the Ruamoko library, it does
actually make for a more consistent language.
 2011-02-13 17:07:14 +09:00
Bill Currie
8a314e9e87 Class pointers need to be directly addressable. 2011-02-13 16:05:50 +09:00
Bill Currie
0b5565396b Add a class type to symbols and rework the CLASS_NAME handling. 
This fixes the problem with [Array alloc] producing a warning about Class
not repsonding to -alloc.
 2011-02-13 16:05:09 +09:00
Bill Currie
3f690eacb1 Fix another double insertion of a symbol. 2011-02-13 15:28:49 +09:00
Bill Currie
127a1c8772 Fix the creation of enum values. 2011-02-13 15:19:55 +09:00
Bill Currie
f24de89a2a Handle type-modified constants. 
The fix for pointers broke constants (particularly, enums). Oops.
 2011-02-13 14:13:32 +09:00
Bill Currie
fa6b8d773c Correctly emit class and category symtab references. 2011-02-13 13:21:00 +09:00
Bill Currie
c4f364fd37 Emit pointers properly. 
Rename ReuseConstant to emit_value and use emit_value to emit any non-short
constant. This fixes the null pointer in the call to __obj_exec_class.
 2011-02-13 10:09:42 +09:00
Bill Currie
1bcf434b20 Move _OBJ_MODULE to the far data space. 2011-02-12 23:00:04 +09:00
Bill Currie
d42a379924 Dump the contents of a pointer def. 2011-02-12 22:59:29 +09:00
Bill Currie
eede83dea1 Avoid crashing when a null class pointer is found. 2011-02-12 22:58:50 +09:00
Bill Currie
3505de6868 Point the near and far data spaced into the merged data space. 
This lets the relocations work on the final data without having to adjust
their locations.
 2011-02-12 22:35:44 +09:00
Bill Currie
181596f5bf Make relocation records store the space of the relocation. 
The space is meaningless for op_* relocations as they are always in the
code space, but def_* relocations need to know which space holds the
location to be adjusted.
 2011-02-12 22:34:38 +09:00
Bill Currie
cfdc2e5d6b Complete the documentation for relocations. 
This covers only in-memory storage of relocation records, not object file
relocations.
 2011-02-12 15:55:58 +09:00
Bill Currie
8c01497936 Give __obj_exec_class a sterner beating. 
When linking a def into a defspace, ensure it can be removed. This fixes
the missing __obj_exec_class def in qwaq.
 2011-02-11 22:29:57 +09:00
Bill Currie
75d90d2f00 Propogate the specifiers through external_decl_list. 2011-02-11 22:29:57 +09:00
Bill Currie
0efc759f2d Catch attempts to create a def with a null type. 2011-02-11 22:29:57 +09:00
Bill Currie
5f3c1872b9 Put class and category reference/name symbols in the symbol table. 
This fixes the undefined defs in qwaq.
 2011-02-11 22:29:57 +09:00
Bill Currie
179c1f7058 Support move statements (structure copy). 2011-02-11 22:29:57 +09:00
Bill Currie
e19f7e3521 Sort out the parameters for QC style functions :) 2011-02-11 22:29:57 +09:00
Bill Currie
370f0b97ed Produce cleaner output for a = b op c. 2011-02-11 22:29:57 +09:00
Bill Currie
d93d8d7d46 Remove the dirty hack used for accessing params and the return value. 
Instead of using the equivalent of *(float*)&.return, now use the
equivalent of (float).return. No conversion is done in the "cast".

NOTE: this sort of cast should be separated from normal casts.
 2011-02-11 22:29:38 +09:00
Bill Currie
f5412c2b20 Remove a fixme. 2011-02-11 22:29:38 +09:00
Bill Currie
c185fbb782 Set the type of the super structure to the correct type. 2011-02-11 22:29:38 +09:00
Bill Currie
7d2a95ee40 Mark a few problem spots. 2011-02-11 22:29:37 +09:00
Bill Currie
a1d4d4bae1 Handle block expressions in is_indirect(). 2011-02-11 22:29:30 +09:00
Bill Currie
b01f960db9 Disable the subgraphs for now. 
They tend to make large trees difficult to read. I might re-enable them
when I've gotten a better handle on dot.
 2011-02-10 15:11:08 +09:00
Bill Currie
c3a991e555 Support nil in initializers. 2011-02-10 14:51:52 +09:00
Bill Currie
adeef4a4eb Copy named expressions. 
Since expressions can be modified, making DAGs this early causes
corruption of the expression tree.
 2011-02-10 14:43:49 +09:00
Bill Currie
6f625e426f Use the correct type when deferencing an offset pointer. 2011-02-10 14:26:12 +09:00
Bill Currie
1099ca086c Dump the offending expression and statement for a bad instruction. 2011-02-10 14:25:09 +09:00
Bill Currie
4a41d97afc Angle brackets and html :P 2011-02-10 14:24:31 +09:00
Bill Currie
01a7af17e5 Beat __obj_exec_class into submission. 2011-02-10 00:15:19 +09:00
Bill Currie
006c16807d Add the statement for based loads. 
Oops :P
 2011-02-09 22:40:16 +09:00
Bill Currie
a43946abf3 Give short values special treatment. 
As a short value fits directly into a statement, it needs a fake def that
holds its value in the def's offset in order for the value to be written to
the statement.
 2011-02-09 22:13:43 +09:00
Bill Currie
c7adde8709 Fix some case&paste errors. 2011-02-09 22:04:54 +09:00
Bill Currie
1b8edc07c9 Adjust the offsets of ivars in derived classes. 
As ivar structs are not independent, their starting offset is not
necessarily zero (almost never will be for derived classes).
 2011-02-09 22:02:52 +09:00
Bill Currie
d66a441867 Write out the far data space as well as the near. 
This causes the Objective-QC structs to be emitted now that they havve been
moved to the far data space. Relocs are broken, though.
 2011-02-09 21:45:29 +09:00
Bill Currie
244d969ae3 Ensure any tail bytes in the strings data are zeroed. 2011-02-09 18:32:37 +09:00
Bill Currie
2d5d8eda5a Save the caller's address when creating new relocations. 2011-02-09 17:16:49 +09:00
Bill Currie
29c1f7ac03 Use the correct type object in emit_struct(). 2011-02-09 17:15:29 +09:00
Bill Currie
59a683d39e Protect the name passed into emit_struct(). 
The name passed into emit_struct is sometimes created via va(), but the
struct creation code also uses va. This makes a mess of names.
 2011-02-09 17:12:47 +09:00
Bill Currie
3e1b034aaf Use EMIT_DEF correctly. 2011-02-09 15:58:32 +09:00
Bill Currie
e75295b00c Make normal C style functions generate code. 2011-02-09 10:25:23 +09:00
Bill Currie
68cdc904f5 Give temporary variables unique names. 2011-02-09 10:04:55 +09:00
Bill Currie
681ded9375 Fix debug line number information. 2011-02-09 09:59:43 +09:00
Bill Currie
5eff00fdeb Fix debug information. 2011-02-09 08:47:01 +09:00
Bill Currie
71c05bd899 Update for the new syntax. 
This one compiles to progs even :) (though it looks broken).
 2011-02-08 22:39:42 +09:00
Bill Currie
81125cff3a Creation of .ctor now mostly works. 
There seems to be problems with the actual code generation using incorrect
addresses, but a very simple test file compiles successfully.
 2011-02-08 22:38:34 +09:00
Bill Currie
1647b1e61d Check for the correct type in emit_symtab_cat_def_cnt(). 2011-02-08 22:31:09 +09:00
Bill Currie
9b52c590f8 Do not try to emit anything when there are no selector references. 2011-02-08 22:28:32 +09:00
Bill Currie
da14c95bb8 Initialize current_symtab in class_init() when necessary. 
If an objective-qc symbol is the first token to be read, class_init() is
called before the parser gets a chance to perform the initialization
action. However, class_init() setting current_symtab if the first
objective-qc symbol is seen in a function body would be bad.
 2011-02-08 22:26:35 +09:00
Bill Currie
c01f742b7b Fix some Class vs ClassPtr confusion. 2011-02-08 18:25:23 +09:00
Bill Currie
0d5ab6600d Store the source expression in a statement. 
This makes problem reporting more informative.
 2011-02-08 18:18:34 +09:00
Bill Currie
faab931ffc Fix assignment of id to class pointers. 2011-02-08 17:12:01 +09:00
Bill Currie
6643c5dd98 Fix messages to super. 2011-02-08 17:09:27 +09:00
Bill Currie
505e141633 Ensure the class symbol is in the symbol table. 2011-02-08 17:08:58 +09:00
Bill Currie
93a5808659 Support direct struct/union field access. 2011-02-08 14:48:26 +09:00
Bill Currie
3c849b970b Handle union access now that they're detected properly. 2011-02-08 14:45:48 +09:00
Bill Currie
204a267b6a Print the def name for a pointer expr when known. 2011-02-08 14:43:57 +09:00
Bill Currie
3b080fcbb0 Fix an uninitialized variable. 2011-02-08 13:27:37 +09:00
Bill Currie
2594be8b1b Fix a type-o ;) 2011-02-08 13:26:49 +09:00
Bill Currie
8c6fc6fb03 Fix a double insertion of a symbol. 2011-02-08 08:44:08 +09:00
Bill Currie
daa88d8f1c Fix a type clash warning I'd failed to notice. 2011-02-08 08:23:25 +09:00
Bill Currie
35d53d0d77 Fix typedefs and class names once and for all. 
I suspect Holub did them that way as a teaching exercise :P
 2011-02-08 08:20:32 +09:00
Bill Currie
7e2173f268 Remove some old code. 2011-02-08 08:16:36 +09:00
Bill Currie
92799650c0 Implement struct field access via a pointer. 2011-02-07 22:15:10 +09:00
Bill Currie
7a1a9e3f2d Better handling of the current storage for function scopes. 2011-02-07 22:11:22 +09:00
Bill Currie
ff70177041 Fix type handling for local variables. 2011-02-07 21:38:58 +09:00
Bill Currie
952a02eb23 Make print_type() output a newline. 2011-02-07 21:31:37 +09:00
Bill Currie
a28ac636a7 Make local declarations support C syntax. 2011-02-07 21:29:04 +09:00
Bill Currie
da4ec3d47c Allow typedefs and classes in structs. 2011-02-07 20:55:13 +09:00
Bill Currie
aefd2a27d5 Make type handling in the grammar more consistent. 2011-02-07 20:54:49 +09:00
Bill Currie
3c64ae7b66 Fix overzealous type merging. 
Use the type name instead of the symbol table for comparing
struct/union/enum types.
 2011-02-07 20:48:01 +09:00
Bill Currie
265a244ba2 Set the symbol type for structs etc as soon as the tag is created. 
Tags (struct/union/enum) are always types.
 2011-02-07 15:30:49 +09:00
Bill Currie
65a07ada1c Implement offset dereferences. 2011-02-07 14:56:29 +09:00
Bill Currie
d2b464053c Fix assignment sub-expressions. 2011-02-07 14:43:07 +09:00
Bill Currie
6fa5bbe473 Support constant folding on enums. 2011-02-07 11:31:23 +09:00
Bill Currie
d549e5c6b5 Allow enums to be tested. 2011-02-07 11:30:56 +09:00
Bill Currie
ef2ad46f7a Convert complex types to a suitable low-level type. 
This takes care of moving structures etc around.
 2011-02-07 10:55:09 +09:00
Bill Currie
b629c12b31 Do not change the type of the return operand. 
Doing so made a mess of returning expressions. It was probably a holdover
from before getting instructions with void operand types working.
 2011-02-07 10:21:54 +09:00
Bill Currie
829fb33e92 Fix converting nil to a pointer type. 2011-02-07 10:10:48 +09:00
Bill Currie
b8127f7543 Do not segfault when printing a pointer value with a bogus type 2011-02-07 09:57:26 +09:00
Bill Currie
28ba4b5712 Correct a comment. 2011-02-07 09:56:33 +09:00
Bill Currie
d564e6f017 Clean out the old debug prints from emit_function() 2011-02-07 08:46:12 +09:00
Bill Currie
76034861c9 Implement direct ivar access in methods. 
A warning needs to be generated for access to ivars in a class method, but
it seems to work (unable to check due to other errors).
 2011-02-07 08:32:52 +09:00
Bill Currie
3025e04ac5 Partially resurrect field_expr() 
For now, only entity.field and ivar access via a pointer have been
implemented. The rest will come later as needed.
 2011-02-07 08:30:28 +09:00
Bill Currie
1d108a8cec Support emitting symbolic constants. 2011-02-06 20:08:54 +09:00
Bill Currie
e4ac92b5f2 Auto-cast between enums and the default type. 2011-02-06 20:08:16 +09:00
Bill Currie
6b7a81f5a7 Run find_type() early on enums and structs. 2011-02-06 20:07:19 +09:00
Bill Currie
d54a96e68a Make enum values visible. 
Put them in the current symbol table as well as the enum symbol table. The
latter is really just for keeping track of what values are in the enum.
 2011-02-06 20:06:09 +09:00
Bill Currie
2860a8b28b enum too is a scalar. 2011-02-06 20:01:55 +09:00
Bill Currie
f2c272f0b8 Make adding a symbol to multiple tables an internal error. 2011-02-06 20:00:14 +09:00
Bill Currie
d7cdf8077b Rename id_ivars to object_ivars. 2011-02-06 15:41:15 +09:00
Bill Currie
c3c693e9c7 Correct construction of type_id. 2011-02-06 15:36:21 +09:00
Bill Currie
e27f3fd7c3 Copy the method's params into the method symbol. 2011-02-06 15:14:42 +09:00
Bill Currie
00bba1eb3a Fix creation of uninitialized global variables. 2011-02-06 14:37:25 +09:00
Bill Currie
59d3dc6ae0 Check early for assignment of a class pointer to id. 2011-02-06 14:35:17 +09:00
Bill Currie
2f7b892452 Fix passing messages to classes. 
Rename class_pointer_def() to class_pointer_symbol() and use it when a
class name is used as the receiver of a message.
 2011-02-06 14:34:40 +09:00
Bill Currie
67957a14df Bring back convert_name(), but siimplified. 
It is now mainly for converting __FILE__ etc, handling expression symbols,
and checking for undefined identifiers.
 2011-02-06 14:29:14 +09:00
Bill Currie
d03fdc5e67 Correctly calculate the size of the ivars of a class. 
Need to include the size of the super class ivars.
 2011-02-05 00:04:35 +09:00
Bill Currie
690ae1cb57 Fix send_message(). 2011-02-04 23:49:25 +09:00
Bill Currie
29fbc3b073 Struct and ivar declarations now seem to work. 
However, not bit-fields.
 2011-02-04 23:48:58 +09:00
Bill Currie
1f6abb2cce Minor cleanups to message_expr(). 
Fix for class names no longer being pointers to the class.
 2011-02-04 23:22:51 +09:00
Bill Currie
eff3957487 Resurrect the address expression code for arrays etc. 
This fixes selector finding.
 2011-02-04 23:20:37 +09:00
Bill Currie
c542e1a453 Possibly fix normal methods. 2011-02-04 22:31:23 +09:00
Bill Currie
d9446c5eb0 Fix builtin methods. 2011-02-04 22:31:22 +09:00
Bill Currie
d0ecbb38b8 Copy the spec bits and storage class for QC functions. 2011-02-04 15:25:21 +09:00
Bill Currie
f721144ca5 Rewrite emit_ivars to use emit_structure. 
The old code was broken anyway :) (it was segfaulting).
 2011-02-04 15:11:47 +09:00
Bill Currie
acb3c0da11 Fix class initialization. 2011-02-04 14:29:47 +09:00
Bill Currie
04b86fcdb7 Move the Objective-QC structs from type.c to class.c 2011-02-04 12:07:32 +09:00
Bill Currie
7b22bfba63 Better Objective-QC keyword detection. 
Use a flag in the keyword struct rather than checking for "@" in the
keyword. This catches such keywords as "id" and "Protocol" as well.
 2011-02-04 08:38:58 +09:00
Bill Currie
993bee4f59 Do not count unimplemented methods. 
The method emitter skips unimplemented methods, so counting them when
figuring out how many methods to emit leads to a segfault.
 2011-02-04 08:26:16 +09:00
Bill Currie
e04ed72afa Increment the index when emitting array elements. 
Oops :)
 2011-02-04 08:25:27 +09:00
Bill Currie
d7853682af Fix conversion of nil to a real type. 2011-02-03 21:37:15 +09:00
Bill Currie
f44a26e268 Fix type chaining when dealing with decls. 2011-02-03 21:32:58 +09:00
Bill Currie
54c8a10fe4 Don't trip over incomplete structs (again:P) 2011-02-03 21:31:14 +09:00
Bill Currie
12d8658ece Create a typedef for obj_module_t. 2011-02-03 18:05:46 +09:00
Bill Currie
b07392b818 Allow ivars to use C syntax declarations. 2011-02-03 18:04:41 +09:00
Bill Currie
dc6296e9b1 Allow ivars to use typedefs and other classes. 2011-02-03 18:03:37 +09:00
Bill Currie
2203903bb2 Temporarily splice the class's ivar chain into the symbol table. 
The root class's ivar symbol table needs to be connected to the global
symbol table while building the current class's ivar symbol table. This
allows access to other classes and typedefs.
 2011-02-03 18:02:49 +09:00
Bill Currie
79df3d2cca Put newly created classes into the symbol table. 2011-02-03 17:28:49 +09:00
Bill Currie
564b7b9968 Use abstract_decl instead of type wherever a generic type is needed. 2011-02-03 10:53:59 +09:00
Bill Currie
a208aed6ef Fix a segfault when encoding incomplete structs. 2011-02-03 10:52:42 +09:00
Bill Currie
22ccd41164 Give struct types a name. 
Use the struct/union's name (minus "tag ") for the type name.
 2011-02-03 10:52:12 +09:00
Bill Currie
d12cdca758 Functions and enums now seem to be working properly. 
find_type now operates recursively (depth-first) so built up typechains
work as expected.

@overload is treated as a specifier (directly as a storage class, similaar
to typedef).
 2011-02-03 10:48:12 +09:00
Bill Currie
52799a4e1c Must merge specifiers :P 2011-02-02 22:59:08 +09:00
Bill Currie
4420a7125e Ensure structs get added to the symbol table. 2011-02-02 22:53:53 +09:00
Bill Currie
a4eaa2a89b Allow typedefed types and classes in parameters. 2011-02-02 21:58:53 +09:00
Bill Currie
aeecdc84dc Get typedef working. 2011-02-02 21:58:11 +09:00
Bill Currie
cca829aa6b Remove a stray semicolon from the grammar. 2011-02-02 21:57:41 +09:00
Bill Currie
400abe7fce Allow freeing of typechains. 2011-02-02 15:15:24 +09:00
Bill Currie
1fe031e8cb Build C style var/func/abs decl types from the outside in. 
QuakeC style are built from the inside out.
 2011-02-02 15:15:04 +09:00
Bill Currie
7fb8c8247e Don't do a find_type on the parsed function. 
This is needed for C style declarations, but breaks QuakeC style. The fix
is to do the find_type once the return type has been filled in.
 2011-02-02 15:08:59 +09:00
Bill Currie
1452da676d Allow types to be built from the outside in. 
This is required for C style decl processing.
 2011-02-02 15:07:44 +09:00
Bill Currie
ac91e9376b The big type-system rewrite. Horribly broken :) 
While broken, it is good enough to compile modulo.r.

This gives qfcc C's type system with QC specifics bolted on top (rather
than trying to cram C's type system into QC's). Pointers and arrays now
use C syntax and semantics (though I think there's a lot of breakage in
there at the moment). Functions themselves are still dual mode: both QC
style and C style are available.
 2011-02-01 21:23:03 +09:00
Bill Currie
d11d128c96 Avoid segfaulting on errors. 2011-02-01 21:18:39 +09:00
Bill Currie
80ce179bc2 Scan the param list for problems with void. 2011-02-01 21:18:08 +09:00
Bill Currie
c53001800a Create a struct for representing specifiers. 
The specifiers are yet to come (next few commits), but this will be
necessary when they do.
 2011-02-01 21:15:51 +09:00
Bill Currie
917c5f08b0 Make a var representing the default type. 
The default type for vars is integer for ruamoko and float for v6 qc.
 2011-02-01 21:12:02 +09:00
Bill Currie
54c14eb899 Add "return" to pascal. 
I'm still not sure I'll keep it, but it's useful for testing.
 2011-01-30 22:16:59 +09:00
Bill Currie
e7424e1496 Don't segfault on bare return statements. 
I will probably need to do something about the required operand for v6
progs, but this will do for now.
 2011-01-30 21:43:56 +09:00
Bill Currie
440a13b649 Untwist params' knickers for pascal, too. 2011-01-30 21:42:10 +09:00
Bill Currie
861ab93274 Don't type-check against the wrong type :P 2011-01-29 09:56:08 +09:00
Bill Currie
afc6605739 Don't set the space for external defs. 2011-01-29 09:55:14 +09:00
Bill Currie
d80a3413e5 Fix a segfault when freeing locations. 
When chasing linked lists with a double pointer, must check the first
dereference and not the pointer itself.
 2011-01-29 09:54:47 +09:00
Bill Currie
e1226bd3f1 Quaternions aren't vectors :P 2011-01-28 21:57:04 +09:00
Bill Currie
2cce903cc9 Set the default storage class for local vars. 2011-01-28 21:56:17 +09:00