c0f7b4ba37
Fix qfvis for android.
...
pthread_cancel is not (and will not be) implemented, so rework the thread
finalization to not need it.
2012-02-05 14:29:46 +09:00
5fdad1c79c
Support more than just mingw cross compiling.
...
This is the beginnings of android support :)
2012-02-05 11:34:11 +09:00
f8dfee6de7
Merge branch 'master' into glsl
2012-01-29 22:36:35 +09:00
1f3eaaf2e0
Fix the importer for blender 2.61.
...
The use_image field of faces disappeared somewhere between 2.59 and 2.61.
2012-01-23 23:10:25 +09:00
86a401b025
Fix the importer for blender 2.61.
...
The use_image field of faces disappeared somewhere between 2.59 and 2.61.
2012-01-22 19:23:02 +09:00
91cb875115
Add vertex loading/writing for MD16.
2012-01-05 16:49:42 +09:00
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
ffc9680653
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:17:57 +09:00
59c621e0cf
Move qfprogs from tools to qfcc (packaging).
2011-12-25 16:23:02 +09:00
cc5140e3a1
Move min/max/bound and field_offset into better locations.
...
min/max bound into mathlib.h (they /are/ math functions, after all) and
field_offset into qtypes.h.
2011-12-24 10:04:33 +09:00
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
8516891329
Edit the package version when building a release.
2011-12-09 11:27:46 +09:00
853bf13d9e
Move the winding code into libQFmodels.
2011-11-28 20:54:35 +09:00
91e65b6c80
Rename mplane_t to plane_t and clean up the mess.
...
I got rather tired of there being multiple definitions of mostly compatible
plane types (and I need a common type anyway). dplane_t still exists for
now because I want to be careful when messing with the actual bsp format.
2011-11-28 20:54:34 +09:00
ea02f3cd44
Fix a missed byteswap when loading qfo files.
2011-11-15 17:36:55 +09:00
2457837b37
Make some improvements to the winding docs.
2011-11-12 12:17:45 +09:00
6b62b850a7
Add an option to omit the mipmap from extracted textures.
...
This is at the request of Spirit (quaddicted). Great idea.
2011-10-05 20:43:40 +09:00
3b8ab404a0
Add the ability to save the extra model parameters.
...
The params are eye position, flags and synctype. Provision is made for
reading them from a text block on export, but nothing is done other than
retrieving the text block.
2011-09-28 07:41:20 +09:00
521f482806
Fix an off-by-one error that caused uvs to wrap.
2011-09-25 20:52:28 +09:00
1277c17cd9
Give the 24-8 bit converter a massive speedup.
...
The biggest part of the speedup is reading from blender's image only once
(it seems that every read does so from GL rather than memory: ouch). Also,
cache the results for each color.
2011-09-25 20:50:32 +09:00
2e2484250c
Add some notes about modelgen's commands.
2011-09-24 21:31:02 +09:00
50795b8239
Calculate the model "size".
...
The size is actually the average area in quake units of the mesh's
triangles. Again, my results are slightly smaller (0.025).
With this, all calculable fields are set. Only eye position, flags and
synctype remain.
2011-09-24 13:18:23 +09:00
07b5db64c6
Calculate the bounding radius.
...
The calculated radius is a smidge (0.05) smaller than the original
(invisibl.mdl), but I think that's due to the difference in source data: id
used the original models, I'm using their output.
2011-09-24 13:03:18 +09:00
3b33d8dade
Make the basis shape key active on import.
...
Blender must have an active shape key before shape key animation will work.
This fixes the models being locked to the first frame until a shape key is
selected via the UI.
2011-09-24 11:43:06 +09:00
bd840726c2
Fix the mangled faces.
...
I /did/ see the warning about vertex index 0 in the obj importer script,
but I didn't take it seriously enough. This fixes both the twisted texture
on a couple of faces, and the truly mangled tris when exporting (using
invisibl.mdl for testing).
2011-09-24 09:00:14 +09:00
a1d9e752cd
Fix the messed up UVs.
...
I had forgotten to invert the t axis.
2011-09-23 19:58:26 +09:00
a80eef8bc4
Get the exporter mostly working.
...
There seems to be some problems with the UVs, only one frame is exported,
and various model params don't get set (eye position, size, bounding
radius, synctype, flags), but the size and shape look right in qf :).
2011-09-23 19:01:31 +09:00
8ccb07d959
Make the MDL classes a little more usable.
...
This really eased the writing of the exporter :)
2011-09-23 19:00:39 +09:00
8bec9cb203
Clean up export_mdl() a little.
2011-09-23 13:00:46 +09:00
4a3731652e
Fix the exported skin conversion.
...
I must remember to test language features in python 3 :P
2011-09-22 14:08:10 +09:00
40f46f2ea3
Complete mdl writing.
...
Except for the normal index in the frame bounds (and potentially frame
names with junk after the terminating nul), the output is identical to the
input for:
mdl=MDL().read("invisibl.mdl")
mdl.write("test.mdl")
2011-09-22 11:44:08 +09:00
e35dd29a2d
Don't use Vector in mdl.py
...
This will make testing of the MDL class a little easier (independent of
Blender).
2011-09-22 11:43:57 +09:00
a58f9582b0
Try to write out the skin.
...
Something's not working as all I get is a black texture, but the basics
(MDL writing) seem to be ok.
2011-09-22 00:58:57 +09:00
ba4ccaf816
Check that all faces are triangles.
2011-09-21 22:34:23 +09:00
57aa19bd44
Rename qfmdl to io_mesh_qfmdl.
...
This fits in better with the blender addon naming scheme.
2011-09-21 20:18:23 +09:00
c3b358f470
Clean up the intra-package import lines.
2011-09-21 19:17:16 +09:00
84f65a0171
Get the "front end" working nicely.
...
Proper enable/disable of export, file filtering and no exceptions :)
2011-09-21 19:17:16 +09:00
2ca39e7f75
Start working on the exporter.
2011-09-21 17:37:32 +09:00
4b9a421928
Split out the MDL class.
...
I will need it for the exporter.
2011-09-21 12:34:09 +09:00
af4a91accf
Do a tiny bit of cleanup.
2011-09-20 19:32:49 +09:00
b00e865d4c
Make the importer work in both 2.58 and svn blender.
2011-09-20 18:58:45 +09:00
67ba9129ed
Report bad mdl files.
2011-09-20 13:34:12 +09:00
9a4e5aef53
Read strings as strings rather than bytes.
2011-09-20 13:33:41 +09:00
a32e45d2d5
Refactor the import code.
...
This should make things a little more maintainable.
2011-09-20 12:44:37 +09:00
d90fd4cee9
Fix a mistake found by a debug build of blender.
2011-09-18 18:49:16 +09:00
c65522b5cf
Add key frames for all shape keys.
2011-09-18 15:37:17 +09:00
94ac2fa675
Remove a debug print
2011-09-18 10:37:28 +09:00
b57e098e93
Rewrite the frame group to action conversion.
...
Now it works :) Mostly :/ Need to figure out how to "finalize" the action.
Also, blender occasionally loses my skin texture :(
2011-09-18 09:58:59 +09:00
dbb1df70b5
Fix frame merging for mdlv3 files.
...
v3 files have no name fields in the frames, so we need to store the
generated name.
2011-09-18 09:18:49 +09:00
ad8afec84c
Merge multiple frames into a single frame group.
...
But only if they seem to be related (ie, the frame name is the same up to
the number). This will later become optional, but it allows me to test
some of the frame group code.
2011-09-17 23:41:35 +09:00
dc76ad6556
Create actions for frames and frame groups.
...
Simple frames get a one key action, groups get an action with a key per
subframe.
2011-09-17 23:13:21 +09:00
644f4db9d1
Add support for v3 (qtest) mdl files.
...
Finally, I can see the dragon in all its... glory?
2011-09-17 09:05:07 +09:00
f7de55ed5e
Create a shape key for every frame and subframe.
...
Shammy has no frame groups :(. Need to find a model with groups.
2011-09-16 20:59:39 +09:00
b0af18478b
Be a little more direct in object linking and materal adding.
2011-09-16 19:14:31 +09:00
de24fa99a8
Break out the skin/material setup code.
2011-09-16 17:57:07 +09:00
41213f2c30
Make the skin show in blender's 3d view.
...
Much thanks to ideasman_42 for showing me which code I needed to grok to
get it working.
2011-09-15 22:45:23 +09:00
320f613263
Give the uvlayer texture a name.
2011-09-15 20:39:26 +09:00
257fefca38
Link the first skin to the imported object.
...
The texture doesn't display properly in 3d space in texture mode yet.
2011-09-15 19:52:18 +09:00
7489d5646b
Convert all skins.
...
Skin groups are now partially supported.
2011-09-15 19:51:52 +09:00
f8e1e3d4ec
Fix incorrect bracket/parens
2011-09-15 19:18:31 +09:00
11f37298be
Reveres the face windings.
...
Blender's vertex order and quake's vertex order seem to be opposed.
2011-09-15 17:23:40 +09:00
0569e0ebd3
Build the uv layout.
2011-09-15 13:21:08 +09:00
99ff91e341
Load the skins into blender images.
...
Skin groups are not yet supported (skipped).
2011-09-15 11:29:54 +09:00
9d025e0058
Begin working on an mdl import/export plugin for blender.
...
This is only preliminary at this stage:
o No export yet.
o Only the first frame is converte4d.
o Skins are not yet converted
2011-09-14 19:33:51 +09:00
3de5575def
Move the menu files into the QF directory for win32.
2011-09-11 17:13:20 +09:00
a71acc9ae5
Move the essential init code into Sys_Init().
2011-09-11 14:56:47 +09:00
b9401fe7c6
Fix incomplete removal of old files.
2011-09-10 18:10:51 +09:00
505660dffe
Nuke another buffer.
...
Though snprintf was used, not having a buffer just makes things cleaner.
2011-09-07 09:41:06 +09:00
f75b0a611b
Some compile fixes for OpenBSD
2011-08-25 22:35:20 +09:00
70d42cc838
Allow light entities to specify a named light property.
2011-08-21 14:40:18 +09:00
73a280f86a
Handle all light types in the switch.
...
Even though nothing is down for those types.
2011-08-21 14:40:18 +09:00
2d8b011bc8
Support negative lights.
2011-08-21 14:40:18 +09:00
efce040d48
Document the fields qflight uses to control lighting.
2011-08-21 14:40:18 +09:00
e42c5a4272
More tests and fix vector/quaternion global dumps.
2011-08-11 14:58:13 +09:00
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
d910c14935
Clean up some doxygen warnings.
2011-07-10 19:12:07 +09:00
617e70c8e3
Clean up a bunch of bison unused warnings.
2011-06-21 19:52:47 +09:00
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
dedda7596d
Just for fun :)
2011-06-15 17:33:03 +09:00
d638fdce83
Add a PlaneFlip macro.
2011-05-07 19:29:03 +09:00
b9d21cbe9a
Catch resizes in the camera view.
...
Avoids a segfault when resizing the window.
2011-04-16 18:58:05 +09:00
3337dc609f
Fix a buffer error.
2011-04-16 13:05:28 +09:00
fb65cd2b44
Cache needed fonts.
...
Obtaining a font has become rather expensive in recent gnustep, so cache
fonts, obtaining new ones only when needed rather than every redraw. Makes
things snappy again :)
2011-04-16 12:17:23 +09:00
36ec375893
Support resizing the window.
...
The resized layout isn't perfect, but at least the usable real estate for
the xy window grows nicely.
2011-04-10 14:34:34 +09:00
9e15e2cd76
Remove a debug print.
2011-04-10 09:14:28 +09:00
c7612dcd99
Make statement dumps a little more informative.
2011-04-10 09:08:46 +09:00
fd6e341e06
Clean up cast_expr() a little bit.
2011-04-10 00:29:27 +09:00
6cb3d18fc4
Use a hash table for finding entities.
...
This gives a major speed boost :)
2011-04-09 18:32:29 +09:00
32f3f5c06b
Use a hash table for epair lookup.
...
This gives a very minor speedup to drawing large maps.
2011-04-09 14:47:36 +09:00
57ed603658
Extract values from constant defs.
2011-04-09 12:42:41 +09:00
cc714864a8
Support converting to/from unsigned values.
2011-04-09 11:32:33 +09:00
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
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
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
c4a398850a
Fix defs as constants for vectors and quaternions.
2011-04-04 21:31:59 +09:00
38b25e0c38
Do not double-allocate space for immediates.
...
Caused by changed semantics in def creation.
2011-04-03 13:11:50 +09:00
92ba110a87
Ensure a field def is emitted for @this.
2011-04-03 13:03:48 +09:00
7f67e6eb17
Refactor the def handling code a little.
2011-04-03 13:03:22 +09:00
6d0b13dbf0
Resolve types whenever possible.
2011-04-03 13:02:04 +09:00
2c9c1bd968
Ensure defs for @self and @this are generated.
2011-04-03 13:00:48 +09:00
2de7733b6a
Fix initialized variable type handling.
...
Same problem as initialized constants :P
2011-03-30 21:21:38 +09:00
8e18c76bde
Make initialized variables defs rather than immediate constants.
2011-03-30 19:58:09 +09:00
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
550fff5467
Allow assignments between any field types.
2011-03-30 08:14:17 +09:00
75c3653be4
Implement some missed relocs.
2011-03-30 08:13:13 +09:00
2bddcefafe
Allow up to 64 faces on a brush.
...
This is temporary until unlimited faces can be supported, but it's
sufficient to load mappi.map.
2011-03-29 12:46:49 +09:00
1911cc1472
Mingw build fixes.
2011-03-27 08:26:42 +09:00
896791b209
Correct the spelling of "int" and clean up the mess.
2011-03-25 16:53:04 +09:00
1617f0765e
Support the default type without segfaulting.
2011-03-25 09:59:48 +09:00
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
71af121665
Detect missing @end tags.
...
Give a warning when @end is forgotten in class implementations.
2011-03-24 11:44:22 +09:00
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
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
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
a9eb793a5e
Yay, even more tests :P
2011-03-22 15:00:46 +09:00
6a49861b49
Fix the bogus source file for "redefined" functions.
2011-03-22 13:45:44 +09:00
7dbd5f656c
Fix traditional vector component access.
2011-03-22 13:05:42 +09:00
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
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
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
cefe7e2e94
Use the correct source of defs for field defs.
2011-03-21 17:07:40 +09:00
0c0f4360da
Make field defs "nosave".
...
The engine treats fielddefs with DEF_SAVEGLOBAL set as bogus.
2011-03-21 17:06:45 +09:00
f5ce9e2004
Fix a merge induced error in overloaded functions.
2011-03-20 19:04:18 +09:00
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
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
8c8a6a4d63
The function return type is the address of the type descriptor...
2011-03-17 20:31:20 +09:00
01144d23cf
Add a new gcc warning option and fix the two bugs it found.
2011-03-17 19:58:56 +09:00
5aa0b34570
Add the cast statement to the statement block.
...
*sob*
2011-03-10 20:43:53 +09:00
f663f587fe
Fix the missing local defs for builtin functions.
2011-03-10 20:16:35 +09:00
899af3119b
Use the correct type when generating a move expression.
2011-03-10 19:30:21 +09:00
2129eaaf20
Dereference moves need movepi rather than movei.
2011-03-10 19:29:23 +09:00
8d69c5c898
More tests
2011-03-09 20:34:23 +09:00
cbbbf87e20
Resurrect the stats output.
2011-03-09 15:51:17 +09:00
8368f57fbf
Close a potential buffer overflow.
2011-03-09 11:09:46 +09:00
4d90eba2ad
Remove some unused globals.
2011-03-09 11:08:30 +09:00
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
39278ba8cc
Explicitly select between direct and indirect moves.
2011-03-09 10:30:57 +09:00
b95cdc33d9
Set instace_size to the correct size.
2011-03-08 22:45:34 +09:00
55eed1ae07
Make module dumping a little more informative.
2011-03-08 22:43:53 +09:00
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
f66e20db17
Set the dereferenced type in the field value.
2011-03-08 19:29:36 +09:00
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
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
8dbf8a97ea
Be more informative with ext/def internal errors.
2011-03-07 20:52:31 +09:00
6312ccba81
Fix storage class blocks.
...
@extern { defs }; etc
2011-03-07 20:51:51 +09:00
4db8ebb6af
Support qcc style local function variables.
2011-03-07 20:04:05 +09:00
853cc53d0f
FIx the handling of storage class.
2011-03-07 17:49:01 +09:00
7649549de6
Handle external field declarations.
2011-03-07 17:23:52 +09:00
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
041c5d53b8
Check for the vector being a constant before trying to get its value.
2011-03-07 14:04:36 +09:00
c069bafad8
Support casting from enum to float.
2011-03-07 14:04:05 +09:00
5a78758781
Support return in void functions in v6 code.
2011-03-07 13:52:28 +09:00
1246fd9e30
Use the correct size when growing a data space.
2011-03-07 13:36:00 +09:00
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
16103f9018
Fix param mangling for qc style functions.
2011-03-07 10:43:38 +09:00
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
0b3d0011c5
Implement vector and quaternion component access.
2011-03-07 10:02:20 +09:00
f0e47f2334
Clean up some code duplication.
2011-03-07 10:01:21 +09:00
a6f222106e
Fix taking the address of normal variables.
...
Treat them the same as structure variables.
2011-03-07 09:58:51 +09:00
3c1784d46c
Fold constants on both sides of = to ensure correct expression types.
2011-03-07 08:33:30 +09:00
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
b2f0c9a127
Dump the local defs for functions when debug info is available.
2011-03-06 21:03:12 +09:00
b49d90e769
Do not lose the block expression when taking its address.
2011-03-06 16:32:51 +09:00
c78d15b331
Support taking the address of block expressions that have a result.
2011-03-06 16:05:38 +09:00
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
b74c644a10
Perform offset field relocations.
2011-03-06 15:41:38 +09:00
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
c4e9a45d91
Do not lose the entity field defs.
2011-03-06 15:40:07 +09:00
b7aa2f6786
Support access to struct fields in a structure in an entity.
2011-03-06 15:39:27 +09:00
fe3d228658
Maintain a symbol table for entity fields.
2011-03-06 15:38:19 +09:00
c29e0250e4
Make def_field_Ofs reloc dumps more informative.
2011-03-06 15:34:53 +09:00
02766f0795
Do not try to dump def values from spaces with no data.
2011-03-06 15:33:53 +09:00
1eb759bb8a
Update reloc_names.
...
I really need to get reloc_names unduplicated.
2011-03-06 15:33:10 +09:00
d1187f0857
Set the edict area size when dumping qfo files.
2011-03-06 13:41:00 +09:00
7bfaf107ce
Set the output file name as early as possible.
2011-03-06 13:40:24 +09:00
417d1b4442
Fix structure copy into and out of entities.
2011-03-06 13:19:20 +09:00
dc7a78b2ff
Fix case label type conversions.
...
The previous method made too many assumptions.
2011-03-06 11:41:01 +09:00
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
85bffbcad0
Add is_integral() to check for integral types (integer, short, enum).
2011-03-06 11:25:12 +09:00
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
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
8cfa80b5d4
Implement think expressions.
2011-03-05 18:01:37 +09:00
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
a3c1f339fc
Gracefully handle undefined symbols in entity field expressions.
2011-03-05 17:22:04 +09:00
fbea276ede
Yet more tests.
2011-03-05 17:21:19 +09:00
7314b944d5
Bring back the offset alias support.
...
Accidently nuked it when fixing .return etc.
2011-03-05 16:31:32 +09:00
e7e8220246
Dump code addresses as hex, too.
2011-03-05 16:25:56 +09:00
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
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
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
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
1dea86a3e4
Update debug info loading when dumping qfo files.
2011-03-05 14:53:41 +09:00
cfefd79e07
Fix the source of bogus string relocs.
...
Nested aggregate initializers were corrupting themselves.
2011-03-05 09:21:12 +09:00
7c95913c61
Avoid segfaulting with bad string relocs.
2011-03-05 09:07:16 +09:00
8eb5fd653a
Perform the relocations!!!
...
line numbers seem to be broken, but the code itself looks good.
2011-03-05 08:41:14 +09:00
fe7be543f8
Correctly update the offset of code relocs.
2011-03-05 08:39:47 +09:00
7fd839a5ed
Handle chains of alias defs so relocs will be emitted.
2011-03-05 08:39:16 +09:00
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
c3f1c186f8
Resolve types of .return etc.
2011-03-05 08:36:55 +09:00
af7bc81e16
Chain the types for the linker.
2011-03-05 08:35:56 +09:00
0bd0f783b2
Update def offsets with their final locations.
2011-03-04 23:37:46 +09:00
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
e62163e569
Nuke any invalidated relocs.
2011-03-04 21:46:19 +09:00
2565e0db32
Update reloc targets when linking.
2011-03-04 21:29:47 +09:00
bc78b84869
Set the target of string relocs to the string index.
2011-03-04 21:29:10 +09:00
7fb22bd1e4
Make D_STRING() more useful and add D_GETSTR()
2011-03-04 21:28:12 +09:00
e04f6266b1
Nuke def_list from defref_t.
...
It didn't work :/.
2011-03-04 20:40:01 +09:00
5a552d8841
Add the null function.
2011-03-04 20:29:40 +09:00
368a3826be
Redo the offset and size calculations for qfo_to_progs().
2011-03-04 20:14:02 +09:00
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
72fae608e5
Write the function start address to the progs file.
...
Oops:P
2011-03-04 18:46:28 +09:00
2211a807d4
Do not relocate builtin functions.
2011-03-04 18:46:25 +09:00
d6d8b5b49d
Generate the debug symbol file.
2011-03-04 18:46:05 +09:00
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
7b7f4c70e0
Correct non-external def processing.
2011-03-04 14:33:03 +09:00
c5dac6d1d1
Transfer the type encoding.
...
oops
2011-03-04 14:29:22 +09:00
d0b4546383
qfprogs isn't yet fully functional...
2011-03-04 13:54:29 +09:00
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
e525727a24
Add a null type descriptor to the linker output.
2011-03-04 11:38:33 +09:00
3a828ca5c2
Ensure work spaces are always connected to their data.
2011-03-04 11:18:56 +09:00
45c3dd67a8
Some test updates.
2011-03-04 08:27:26 +09:00
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
c99f3aba0e
Add the new header files for make dist.
2011-03-04 00:11:13 +09:00
fd24524e13
More tests.
...
I really need to sort out some test automation.
2011-03-03 22:32:22 +09:00
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
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
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
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
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
b5e7e666e9
Fix some missed branch/goto expression changes.
2011-03-03 17:33:53 +09:00
c5ecc170b6
Give labels a usage count to detect unused labels.
2011-03-03 15:28:49 +09:00
90640614ef
Compare symbols using the right method.
...
That fixme was right :)
2011-03-03 15:02:26 +09:00
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
bad5fddec4
Fix overloaded function resolution.
...
Update the expression symbol pointer, not just the symbol name.
2011-03-03 14:44:48 +09:00
fff4fc693e
Fix value hashing and comparison in switch expressions.
2011-03-03 14:02:18 +09:00
74e6b13aee
Use alias expressions where possible when testing an expression.
2011-03-03 13:47:28 +09:00
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
022fde666f
Implement unary expression statements.
2011-03-03 13:10:07 +09:00
45de7327dc
Implement alias expressions (finally).
...
Alias expressions are like cast expressions, but never do any conversions.
2011-03-03 11:06:10 +09:00
848994323e
Support enums in expressions that support scalar types.
2011-03-03 10:36:43 +09:00
c12211d8bb
Support enum results for boolean expressions.
...
eg enum BOOL x = a && b;
2011-03-02 22:46:55 +09:00
c06dd776d2
Fix expression initializers for arrays and structs.
2011-03-02 22:28:17 +09:00
76f912c7a1
Fix function typedefs.
2011-03-02 22:23:24 +09:00
aa4ed00090
Fix the message type used to check arguments.
2011-03-02 22:13:16 +09:00
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
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
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
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
824d8bfc3c
Remove some now unnecessary functions.
2011-03-02 14:21:20 +09:00
065d3e0dd7
Partial linking for a single qfo file now seems to work.
2011-03-02 14:03:41 +09:00
bfeece3255
Fix the bogus declarations of obj_msgSend and obj_msgSend_super.
2011-03-02 12:35:10 +09:00
fda46a4aca
Handle the special defs.
2011-03-02 12:26:53 +09:00
330e76a9ac
Set the correct storage class for struct and enum specifiers.
2011-03-02 11:29:08 +09:00
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
8669dc373f
Add some documentation.
2011-03-02 11:13:44 +09:00
65bd215058
Minor rearrangements.
2011-03-01 15:35:14 +09:00
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
9f126ed805
Add some quick type access macros.
2011-03-01 15:18:12 +09:00
b584a22d6b
Fix external function declarations.
...
Use spec.storage rather than current_storage.
2011-03-01 11:08:33 +09:00
cce6838e16
Ensure .ctor is declared static.
2011-03-01 11:08:32 +09:00
c36919aae7
Fix verbosity and diagnostic messages.
2011-03-01 11:08:32 +09:00
cfff2b1037
Add defs from near and far data spaces.
2011-03-01 10:52:27 +09:00
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
1416b996d3
Ensure the type space pointer is cleared with each object file.
2011-03-01 09:18:09 +09:00
30272968c9
Update the def's type pointer.
2011-03-01 09:17:32 +09:00
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
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
05e6f00e72
Initialize the new type def.
...
Oops :P
2011-03-01 08:16:14 +09:00
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
bad7078797
Don't set the space defs pointer if there are no defs.
2011-02-28 23:16:59 +09:00
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
b544196c21
Change ptrfld to fldptr for consistency with type.h.
2011-02-28 23:12:32 +09:00
8b661bbb89
Rename qfo_reloc_t's def to target and correct its usage.
2011-02-27 11:37:24 +09:00
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
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
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
55043310fc
Fix the QFO_POINTER macro
2011-02-27 00:31:52 +09:00
9cf63dbbdf
Clean up the create of the obj_module_s structure.
2011-02-26 22:06:22 +09:00
cbfbc0b01a
Ensure type_ClassPtr is chained before it is used.
2011-02-26 22:05:53 +09:00
a7ae71efad
Fix some type encoding problems found using qfprogs.
2011-02-25 15:59:23 +09:00
58ac212b54
Fix qfo function dumping.
2011-02-25 13:37:23 +09:00
2b3436beed
Fix qfo reloc dumping.
2011-02-25 13:29:09 +09:00
f43eda63fe
Fix qfo global dumping.
2011-02-25 09:39:07 +09:00
65c7d421c6
Update the qfo access macros for the new format.
2011-02-25 09:38:22 +09:00
f362e74f98
Update the header.
2011-02-24 15:24:35 +09:00
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
8f1e2c143a
Clean up some fixmes.
2011-02-24 14:08:42 +09:00
c10a551c84
Rename new_defspace() and defspace_new_loc().
2011-02-24 13:07:36 +09:00
88cd37a3e2
Header update for the renamed files.
2011-02-24 13:00:19 +09:00
5efeb7ebf8
Rename some files that have been bugging me.
2011-02-24 12:59:18 +09:00
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
74497f00e1
Read qfo object files :)
2011-02-23 18:10:38 +09:00
33810e9c91
Write out object files in the new format.
2011-02-23 15:05:33 +09:00
1f7c39b918
Chain @va_list's type.
...
Oops :P
2011-02-23 14:49:00 +09:00
a1ea492889
Remove some redundant fields from qfo objects.
2011-02-23 10:40:35 +09:00
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
e68e6d0858
Create defs for entity fields in the entity space.
2011-02-22 15:43:15 +09:00
e1158a83f0
Begin work on rewriting obj_file.c for the new format.
2011-02-22 15:42:49 +09:00
64cf07351f
Encode types to string and qfo representation on creation.
2011-02-22 13:36:16 +09:00
a07cd17f38
Update TODO.
...
Remove old entries and add some new ones.
2011-02-22 12:23:00 +09:00
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
7d1f2c4ef3
Fix field def allocation for non-function fields.
2011-02-22 10:43:35 +09:00
ecbb904d6b
More docs and clearer types.
2011-02-22 09:23:04 +09:00
b7c6c4af5d
Better variable naming in init_elements().
2011-02-22 09:22:04 +09:00
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
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
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
96c6b31c66
Update qfo version and correct some comments and types.
2011-02-21 18:24:34 +09:00
4c11304c8d
Documentation tweaks.
2011-02-21 08:41:03 +09:00
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
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
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
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
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
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
d04865884f
Set the method's function pointer.
2011-02-15 22:27:13 +09:00
3721b2edca
Method lists are made of methods, not integers :P
2011-02-15 22:26:44 +09:00
c068138d91
More addresses in hex.
2011-02-15 22:26:09 +09:00
814e36d3c8
Correct an error message and tidy some code.
2011-02-15 22:25:40 +09:00
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
5252d72856
Correct the type for _OBJ_SELECTOR_TABLE.
2011-02-15 15:33:12 +09:00
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
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
6bd63f811f
Preserve any relocs when converting a def from extern to otherwise.
2011-02-15 10:47:16 +09:00
62456dc1e9
Yet another test.
2011-02-15 09:48:10 +09:00
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
19f6faf0ad
Fix aggregate initializers.
...
Initializing arrays and structs seems to be working.
2011-02-15 09:30:37 +09:00
d162838299
Resurrect constant_expr().
2011-02-15 09:28:27 +09:00
bc882ddc3c
Fix the parser side of aggregate initializers.
2011-02-14 23:31:37 +09:00
09af401f0c
Reset current_func at the end of each function.
2011-02-14 23:10:46 +09:00
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
5707888fcf
Fix some error-recovery segfaults.
2011-02-14 23:10:46 +09:00
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
b3d5789377
More tests.
2011-02-14 23:10:46 +09:00
23b01be214
Handle invalid initializers gracefully.
2011-02-14 23:10:46 +09:00
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
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
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
352be1f8bd
Handle null string pointers.
2011-02-14 23:10:45 +09:00
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
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
fc18ebd923
Add the source line number to most node labels.
2011-02-14 23:10:45 +09:00
3e5989463f
Update the def_tail when removing the last def from the space.
2011-02-14 23:10:45 +09:00
11485556e5
Quote expression names to avoid problems with null pointers.
2011-02-14 23:10:45 +09:00
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
e3325b199e
More tests.
2011-02-14 23:10:45 +09:00
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
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
acced90101
Create the symbol for the struct as early as possible.
2011-02-13 20:55:33 +09:00
b545f72f93
Report errors for incomplete types and missing fields.
2011-02-13 20:23:08 +09:00
Bill Currie
Jeff Teunissen