qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Replace [no-]v6only with target=

Browse source 
This allows v6, v6p (older QF VM) or ruamoko (new QF VM) to be targeted.
Currently defaults to v6p to allow QF to continue building without too
much hassle.
This commit is contained in:
Bill Currie 2022-01-07 18:34:05 +09:00
parent fe153b5b22
commit 2d245b8cdc
2 changed files with 43 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
tools/qfcc/doc/man/qfcc.1
View file

@ -190,7 +190,7 @@ Look for \*[progs.src] in \fBDIR\fP instead of the current directory.
.TP
.B \-\-traditional
Use traditional QuakeC syntax, semantics and \*(lqbugs\*(rq.
Also implies the \fBv6only\fP, \fBno-short-circuit\fP,
Also implies the \fBtarget=v6\fP, \fBno-short-circuit\fP,
\fBconst-initializers\fP and \fBno-local-merging\fP code generation options
(see \fBCODE GENERATION OPTIONS\fP).
This is the default when using \fBprogs.src\fP mode.
@ -271,8 +271,8 @@ output file is \*(lqprogs.dat\*(rq, the symbol file will be
.B fast\-float
Use float values directly in \*(lqif\*(rq statements.
Defaults to on.
This option is always enabled when using version 6 progs (\fBv6only\fP is in
effect).
This option is always enabled when targeting v6 progs (\fBtarget=v6\fP is
in effect).
.TP
.B local-merging
@ -289,8 +289,9 @@ Defaults to off for traditional mode, and on for advanced mode.
.TP
.B promote\-float
Promote float when passed to a function that takes a variable number of
arguements. Defaults to enabled for advanced code, is forced off for
traditional or v6only code (mostly because such code does not have doubles).
arguements. Defaults to enabled for advanced code (v6p or ruamoko), is forced
off for traditional or v6 code (mostly because such code does not have
doubles).
.TP
.B short\-circuit
@ -329,18 +330,32 @@ Create extra symbols for accessing the components of a vector variable or
field. For example, \fBvector vel\fP will also create \fBvel_x\fP,
\fBvel_y\fP, and \fBvel_z\fP. Defaults to on for traditional code and off
for advanced.
.PP
Any of the above can be prefixed with \fBno\-\fP to negate its meaning.
.TP
.B v6only
Restrict the compiler to produce only version 6 progs (original
Quake/QuakeWorld) features.
.B target=v6|v6p|ruamoko
Specify the target for which the compiler is to produce code.
.RS
.TP
.B v6
Standard Quake VM (qcc compatible).
This means that the compiled data file should be able to run on older servers,
as long as you have not used any QuakeForge-specific built-in functions.
Also disables compiler features (such as integers and string manipulation
support) that require extensions.
Defaults to on for traditional mode and off for advanced mode.
.PP
Any of the above can be prefixed with \fBno\-\fP to negate its meaning.
.TP
.B v6p
Quakeforge extended v6 instructions.
This is not compatible with older server, nor with most (any?) other Quake
engine. It adds a variety of instructions and types, including integers,
quaternions, pointers, doubles, structs, arrays and Objective-C style classes.
.TP
.B ruamoko
Quakeforge SIMD instructions. This is currently under development
and thus not the default.
.RE
Defaults to v6 for traditional mode and v6p for advanced mode.
.SH "WARNING OPTIONS"

24
tools/qfcc/source/options.c
View file

@ -207,8 +207,10 @@ code_usage (void)
" passing\n"
" vectors to functiosn.\n"
" [no-]vector-components Create *_[xyz] symbols for vector variables.\n"
" [no-]v6only Restrict output code to version 6 progs\n"
" features.\n"
" target=v6|v6p|ruamoko Generate code for the specified target VM\n"
" v6 Standard Quake VM (qcc compatible)\n"
" v6p *QuakeForge extended v6 instructions\n"
" ruamoko QuakeForge SIMD instructions\n"
"\n"
"For details, see the qfcc(1) manual page\n"
);
@ -469,6 +471,19 @@ DecodeArgs (int argc, char **argv)
while (temp) {
qboolean flag = true;
if (!(strncasecmp (temp, "target=", 7))) {
const char *tgt = temp + 7;
if (!strcasecmp (tgt, "v6")) {
options.code.progsversion = PROG_ID_VERSION;
} else if (!strcasecmp (tgt, "v6p")) {
options.code.progsversion = PROG_V6P_VERSION;
} else if (!strcasecmp (tgt, "ruamoko")) {
options.code.progsversion = PROG_VERSION;
} else {
fprintf (stderr, "unknown target: %s\n", tgt);
exit (1);
}
}
if (!strncasecmp (temp, "no-", 3)) {
flag = false;
temp += 3;
@ -501,11 +516,6 @@ DecodeArgs (int argc, char **argv)
options.code.vector_calls = flag;
} else if (!(strcasecmp (temp, "vector-components"))) {
options.code.vector_components = flag;
} else if (!(strcasecmp (temp, "v6only"))) {
if (flag)
options.code.progsversion = PROG_ID_VERSION;
else
options.code.progsversion = PROG_V6P_VERSION;
} else if (!(strcasecmp (temp, "const-initializers"))) {
options.code.const_initializers = flag;
}