qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-18 06:51:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

qtypes.h:

Browse source 
remove includes of qdefs.h and compat.h
pr_comp.h:
	merge pr_comp.h from quake and qfcc, removing the copy in qfcc
cmdlib.[ch]:
	nuke the endian code.
qendian.c:
	initialise the LittleLong etc pointers at compile time rather than run
	time
com.c (both nq and qw):
	nuke the LittleLong etc init code
everything else:
	fix up after the qtypes.h cleanup
This commit is contained in:
Bill Currie 2001-03-28 17:17:56 +00:00
parent 5a48f987a5
commit cb5c262ffc
65 changed files with 151 additions and 431 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
include/QF/pr_comp.h
View file

@ -1,38 +1,31 @@
/*
pr_comp.h
/* Copyright (C) 1996-1997 Id Software, Inc.
(description)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
Copyright (C) 1996-1997 Id Software, Inc.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
See file, 'COPYING', for details.
*/
// this file is shared by quake and qcc
#ifndef _PR_COMP_H
#define _PR_COMP_H
// this file is shared by QuakeForge and qfcc
#ifndef __pr_comp_h
#define __pr_comp_h
#include "QF/qtypes.h"
typedef int func_t;
typedef int string_t;
typedef enum {
ev_void,
ev_string,
@ -44,6 +37,7 @@ typedef enum {
ev_pointer
} etype_t;
#define OFS_NULL 0
#define OFS_RETURN 1
#define OFS_PARM0 4 // leave 3 ofs for each parm to hold vectors
@ -56,6 +50,7 @@ typedef enum {
#define OFS_PARM7 25
#define RESERVED_OFS 28
enum {
OP_DONE,
OP_MUL_F,
@ -134,6 +129,7 @@ enum {
OP_BITOR
};
typedef struct statement_s
{
unsigned short op;
@ -167,8 +163,8 @@ typedef struct
byte parm_size[MAX_PARMS];
} dfunction_t;
#define PROG_VERSION 6
#define PROG_VERSION 6
typedef struct
{
int version;
@ -195,4 +191,4 @@ typedef struct
int entityfields;
} dprograms_t;
#endif // _PR_COMP_H
#endif // __pr_comp_h

9
include/QF/qtypes.h
View file

@ -34,8 +34,8 @@
#include <stdio.h>
#include <sys/types.h>
#include "QF/qdefs.h"
#include "QF/compat.h"
//#include "QF/qdefs.h"
//#include "QF/compat.h"
#define MAX_QPATH 64
@ -44,10 +44,13 @@
typedef unsigned char byte;
#endif
#ifndef _DEF_BOOL_
# define _DEF_BOOL_
// KJB Undefined true and false defined in SciTech's DEBUG.H header
#undef true
#undef false
typedef enum {false, true} qboolean;
#endif
// From mathlib...
typedef float vec_t;
@ -58,8 +61,6 @@ typedef int fixed8_t;
typedef int fixed16_t;
typedef int func_t;
typedef int string_t;
typedef byte pixel_t;
#endif // __qtypes_h

1
libs/gamecode/pr_edict.c
View file

@ -35,6 +35,7 @@
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <stdarg.h>
#include "QF/cmd.h"
#include "QF/console.h"

1
libs/util/cmd.c
View file

@ -40,6 +40,7 @@
#include "QF/cvar.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/hash.h"
#include "QF/qargs.h"

1
libs/util/cvar.c
View file

@ -42,6 +42,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cmd.h"
#include "QF/cvar.h"

1
libs/util/info.c
View file

@ -39,6 +39,7 @@
#include <stdio.h>
#include <ctype.h>
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/info.h"

25
libs/util/qendian.c
View file

@ -34,19 +34,30 @@
#include <ctype.h>
#include "QF/qendian.h"
#include "QF/qtypes.h"
/*
BYTE ORDER FUNCTIONS
*/
qboolean bigendien;
short (*BigShort) (short l);
short (*LittleShort) (short l);
int (*BigLong) (int l);
int (*LittleLong) (int l);
float (*BigFloat) (float l);
float (*LittleFloat) (float l);
#ifndef WORDS_BIGENDIAN
qboolean bigendien = false;;
short (*BigShort) (short l) = ShortSwap;
short (*LittleShort) (short l) = ShortNoSwap;
int (*BigLong) (int l) = LongSwap;
int (*LittleLong) (int l) = LongNoSwap;
float (*BigFloat) (float l) = FloatSwap;
float (*LittleFloat) (float l) = FloatNoSwap;
#else
qboolean bigendien = true;;
short (*BigShort) (short l) = ShortNoSwap;
short (*LittleShort) (short l) = ShortSwap;
int (*BigLong) (int l) = LongNoSwap;
int (*LittleLong) (int l) = LongSwap;
float (*BigFloat) (float l) = FloatNoSwap;
float (*LittleFloat) (float l) = FloatSwap;
#endif
short
ShortSwap (short l)

19
nq/source/com.c
View file

@ -30,7 +30,6 @@
# include "config.h"
#endif
#include "QF/qendian.h"
#include "QF/cvar.h"
#include "QF/quakefs.h"
#include "QF/console.h"
@ -81,24 +80,6 @@ COM_Init
void
COM_Init ()
{
#ifndef WORDS_BIGENDIAN
bigendien = false;
BigShort = ShortSwap;
LittleShort = ShortNoSwap;
BigLong = LongSwap;
LittleLong = LongNoSwap;
BigFloat = FloatSwap;
LittleFloat = FloatNoSwap;
#else
bigendien = true;
BigShort = ShortNoSwap;
LittleShort = ShortSwap;
BigLong = LongNoSwap;
LittleLong = LongSwap;
BigFloat = FloatNoSwap;
LittleFloat = FloatSwap;
#endif
registered = Cvar_Get ("registered", "0", CVAR_NONE, "None");
cmdline = Cvar_Get ("cmdline", "0", CVAR_SERVERINFO, "None");
Cmd_AddCommand ("path", COM_Path_f, "No Description");

1
nq/source/in_sdl.c
View file

@ -33,6 +33,7 @@
#include <SDL.h>
#include "client.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "draw.h"

1
nq/source/in_svgalib.c
View file

@ -45,6 +45,7 @@
#include "client.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "host.h"

1
nq/source/in_x11.c
View file

@ -57,6 +57,7 @@
#endif
#include "client.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "context_x11.h"
#include "QF/cmd.h"

1
nq/source/joy_linux.c
View file

@ -36,6 +36,7 @@
#include <fcntl.h>
#include <unistd.h>
#include "QF/compat.h"
#include "QF/console.h"
#include "client.h"
#include "QF/cvar.h"

1
nq/source/quakefs.c
View file

@ -62,6 +62,7 @@
#include <limits.h>
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "draw.h"

1
nq/source/snd_mix.c
View file

@ -36,6 +36,7 @@
# include <strings.h>
#endif
#include "QF/compat.h"
#include "QF/console.h"
#include "sound.h"

3
nq/source/sv_progs.c
View file

@ -40,11 +40,12 @@
#include "QF/cmd.h"
#include "QF/console.h"
#include "host.h"
#include "progdefs.h"
#include "server.h"
#include "sv_progs.h"
#include "world.h"
#include "progdefs.h"
progs_t sv_pr_state;
sv_globals_t sv_globals;
sv_funcs_t sv_funcs;

3
qw/include/net.h
View file

@ -30,8 +30,9 @@
#define _NET_H
#include "QF/gcc_attr.h"
#include "QF/sizebuf.h"
#include "QF/cvar.h"
#include "QF/qdefs.h"
#include "QF/sizebuf.h"
#define PORT_ANY -1

1
qw/source/cd_linux.c
View file

@ -41,6 +41,7 @@
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <stdlib.h>
#include <errno.h>

1
qw/source/cl_ents.c
View file

@ -41,6 +41,7 @@
#include "cl_main.h"
#include "cl_pred.h"
#include "cl_tent.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "d_iface.h"
#include "host.h"

1
qw/source/cl_main.c
View file

@ -72,6 +72,7 @@
#include "cl_tent.h"
#include "client.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "draw.h"

1
qw/source/cl_parse.c
View file

@ -52,6 +52,7 @@
#include "cl_tent.h"
#include "client.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "host.h"
#include "QF/msg.h"

1
qw/source/cl_slist.c
View file

@ -44,6 +44,7 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <stdlib.h>
#include "bothdefs.h"
#include "cl_slist.h"

19
qw/source/com.c
View file

@ -35,7 +35,6 @@
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/qendian.h"
#include "QF/quakefs.h"
#include "QF/sys.h"
@ -86,24 +85,6 @@ COM_CheckRegistered (void)
void
COM_Init (void)
{
#ifndef WORDS_BIGENDIAN
bigendien = false;
BigShort = ShortSwap;
LittleShort = ShortNoSwap;
BigLong = LongSwap;
LittleLong = LongNoSwap;
BigFloat = FloatSwap;
LittleFloat = FloatNoSwap;
#else
bigendien = true;
BigShort = ShortNoSwap;
LittleShort = ShortSwap;
BigLong = LongNoSwap;
LittleLong = LongSwap;
BigFloat = FloatNoSwap;
LittleFloat = FloatSwap;
#endif
Cmd_AddCommand ("path", COM_Path_f, "Show what paths Quake is using");
COM_Filesystem_Init ();

1
qw/source/d_init.c
View file

@ -30,6 +30,7 @@
# include "config.h"
#endif
#include "QF/compat.h"
#include "bothdefs.h"
#include "d_local.h"

1
qw/source/gl_dyn_part.c
View file

@ -39,6 +39,7 @@
#include <stdlib.h>
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "glquake.h"
#include "host.h"

1
qw/source/gl_rmain.c
View file

@ -45,6 +45,7 @@
#include "cl_main.h"
#include "cl_parse.h" //FIXME CL_NewTranslation
#include "commdef.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "locs.h"
#include "glquake.h"

1
qw/source/gl_rsurf.c
View file

@ -41,6 +41,7 @@
#include <stdio.h>
#include "glquake.h"
#include "QF/compat.h"
#include "QF/sys.h"
qboolean r_cache_thrash;

1
qw/source/gl_screen.c
View file

@ -40,6 +40,7 @@
#include "cl_parse.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "draw.h"
#include "glquake.h"

1
qw/source/gl_skin.c
View file

@ -34,6 +34,7 @@
#include "host.h"
#include "protocol.h"
#include "skin.h"
#include "QF/compat.h"
#include "QF/sys.h"
#include "texture.h"

1
qw/source/gl_textures.c
View file

@ -40,6 +40,7 @@
#include <stdio.h>
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/crc.h"
#include "draw.h"

1
qw/source/gl_view.c
View file

@ -41,6 +41,7 @@
#include "bothdefs.h"
#include "glquake.h"
#include "view.h"
#include "QF/compat.h"
extern byte *host_basepal;

1
qw/source/in_sdl.c
View file

@ -34,6 +34,7 @@
#include "client.h"
#include "cl_input.h"
#include "cl_main.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "draw.h"

1
qw/source/in_svgalib.c
View file

@ -45,6 +45,7 @@
#include "cl_input.h"
#include "client.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "host.h"

1
qw/source/in_x11.c
View file

@ -57,6 +57,7 @@
#include "cl_input.h"
#include "client.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "context_x11.h"
#include "QF/cmd.h"

1
qw/source/joy_linux.c
View file

@ -35,6 +35,7 @@
#include <fcntl.h>
#include <unistd.h>
#include "QF/compat.h"
#include "QF/console.h"
#include "client.h"
#include "QF/cvar.h"

1
qw/source/pmovetst.c
View file

@ -36,6 +36,7 @@
# include <strings.h>
#endif
#include "QF/compat.h"
#include "QF/console.h"
#include "model.h"
#include "pmove.h"

1
qw/source/quakefs.c
View file

@ -63,6 +63,7 @@
#include "QF/cmd.h"
#include "commdef.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "draw.h"

1
qw/source/r_misc.c
View file

@ -30,6 +30,7 @@
# include "config.h"
#endif
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cmd.h"
#include "cl_parse.h"

1
qw/source/r_part.c
View file

@ -32,6 +32,7 @@
#include <stdlib.h>
#include "QF/compat.h"
#include "QF/console.h"
#include "host.h"
#include "QF/qargs.h"

1
qw/source/r_view.c
View file

@ -36,6 +36,7 @@
#include "bothdefs.h"
#include "client.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/cvar.h"
#include "host.h"
#include "QF/msg.h"

1
qw/source/sbar.c
View file

@ -42,6 +42,7 @@
#include "cl_cam.h"
#include "client.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "commdef.h"
#include "draw.h"
#include "QF/msg.h"

1
qw/source/screen.c
View file

@ -41,6 +41,7 @@
#include "cl_parse.h"
#include "client.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "d_iface.h"
#include "draw.h"

1
qw/source/skin.c
View file

@ -38,6 +38,7 @@
#include "cl_parse.h"
#include "client.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cmd.h"
#include "host.h"

1
qw/source/snd_mix.c
View file

@ -36,6 +36,7 @@
# include <strings.h>
#endif
#include "QF/compat.h"
#include "QF/console.h"
#include "sound.h"

1
qw/source/sv_ccmds.c
View file

@ -40,6 +40,7 @@
#include "bothdefs.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/msg.h"
#include "QF/qargs.h"
#include "QF/qendian.h"

1
qw/source/sv_ents.c
View file

@ -36,6 +36,7 @@
# include <strings.h>
#endif
#include "QF/compat.h"
#include "QF/msg.h"
#include "msg_ucmd.h"
#include "server.h"

1
qw/source/sv_main.c
View file

@ -42,6 +42,7 @@
#include "bothdefs.h"
#include "buildnum.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "model.h"
#include "net.h"
#include "QF/msg.h"

1
qw/source/sv_progs.c
View file

@ -38,6 +38,7 @@
#endif
#include "QF/cmd.h"
#include "QF/compat.h"
#include "server.h"
#include "progdefs.h"
#include "sv_progs.h"

1
qw/source/sv_user.c
View file

@ -44,6 +44,7 @@
#include "bothdefs.h"
#include "QF/checksum.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "msg_ucmd.h"

1
qw/source/sw_skin.c
View file

@ -40,6 +40,7 @@
#include "client.h"
#include "host.h"
#include "skin.h"
#include "QF/compat.h"
#include "QF/sys.h"
#include "vid.h"

1
qw/source/sw_view.c
View file

@ -34,6 +34,7 @@
#include "host.h"
#include "r_local.h"
#include "view.h"
#include "QF/compat.h"
extern cvar_t *cl_cshift_powerup;

1
qw/source/sys_unix.c
View file

@ -32,6 +32,7 @@
#endif
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>

1
qw/source/vid_glx.c
View file

@ -46,6 +46,7 @@
# include <X11/extensions/xf86dga.h>
#endif
#include "QF/compat.h"
#include "QF/console.h"
#include "context_x11.h"
#include "glquake.h"

1
qw/source/vid_sdl.c
View file

@ -35,6 +35,7 @@
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <stdlib.h>
#include <SDL.h>

1
qw/source/vid_sgl.c
View file

@ -41,6 +41,7 @@
#include <SDL.h>
#include "QF/compat.h"
#include "QF/console.h"
#include "glquake.h"
#include "host.h"

1
qw/source/vid_svgalib.c
View file

@ -47,6 +47,7 @@
#include <vga.h>
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "d_local.h"

1
qw/source/vid_x11.c
View file

@ -67,6 +67,7 @@
#include "client.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "context_x11.h"
#include "QF/cvar.h"

25
tools/qfcc/configure.in
View file

@ -37,6 +37,13 @@ if test "$1" = gcc; then
fi
fi
dnl We want warnings, lots of warnings...
if test "x$GCC" = xyes; then
CFLAGS="$CFLAGS -Wall -Werror"
# CFLAGS="$CFLAGS -Wall -pedantic"
fi
dnl Checks for libraries.
dnl Checks for header files.
@ -49,29 +56,32 @@ dnl Checks for library functions.
AC_ARG_WITH(qf-headers,
[ --with-qf-headers=DIR use the QuakeForge headers found in DRI],
QF_HEADERS=$withval, QF_HEADERS=auto)
QF_INCL=$withval, QF_INCL=auto)
AC_ARG_WITH(qf-libs,
[ --with-qf-libs=DIR use the QuakeForge libs found in DRI],
QF_LIBS=$withval, QF_LIBS=auto)
AC_MSG_CHECKING(for QF headers location)
if test "x$QF_HEADERS" = xauto; then
if test "x$QF_INCL" = xauto; then
qf_dir=`cd ${srcdir}/../..; pwd`
if test -r ${qf_dir}/include/QF/qtypes.h; then
QF_HEADERS="-I ${qf_dir}/include"
QF_INCL="-I${qf_dir}/include"
else
QF_HEADERS=''
QF_INCL=''
fi
else
QF_HEADERS="-I ${QF_HEADERS}"
QF_INCL="-I${QF_INCL}"
fi
AC_MSG_RESULT($QF_HEADERS)
AC_MSG_RESULT($QF_INCL)
AC_SUBST(QF_INCL)
AC_MSG_CHECKING(for QF libs location)
QF_DEPS=""
if test "x$QF_LIBS" = xauto; then
qf_dir=`cd ${srcdir}/../..; pwd`
if test -r ${qf_dir}/libs/util/qfplist.c; then
QF_LIBS="-L ${qf_dir}/libs/util"
QF_DEPS="${qf_dir}/libs/libqfutil.a"
else
QF_LIBS=''
fi
@ -79,6 +89,9 @@ else
QF_LIBS="-L ${QF_LIBS}"
fi
AC_MSG_RESULT($QF_LIBS)
QF_LIBS="${QF_LIBS} -lqfutil"
AC_SUBST(QF_LIBS)
AC_SUBST(QF_DEPS)
AC_OUTPUT(
include/Makefile

17
tools/qfcc/include/cmdlib.h
View file

@ -30,12 +30,16 @@
#include <time.h>
#include <stdarg.h>
#ifndef __BYTEBOOL__
#define __BYTEBOOL__
typedef enum {false, true} qboolean;
#ifndef _DEF_BYTE_
# define _DEF_BYTE_
typedef unsigned char byte;
#endif
#ifndef _DEF_BOOL_
# define _DEF_BOOL_
typedef enum {false, true} qboolean;
#endif
// the dec offsetof macro doesn't work very well...
#define myoffsetof(type,identifier) ((size_t)&((type *)0)->identifier)
@ -57,13 +61,6 @@ void SafeWrite (FILE *f, void *buffer, int count);
int LoadFile (char *filename, void **bufferptr);
short BigShort (short l);
short LittleShort (short l);
int BigLong (int l);
int LittleLong (int l);
float BigFloat (float l);
float LittleFloat (float l);
char *COM_Parse (char *data);
extern char com_token[1024];

179
tools/qfcc/include/pr_comp.h
View file

@ -1,179 +0,0 @@
/* Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
See file, 'COPYING', for details.
*/
// this file is shared by QuakeForge and qfcc
typedef int func_t;
typedef int string_t;
typedef enum {ev_void, ev_string, ev_float, ev_vector, ev_entity, ev_field, ev_function, ev_pointer} etype_t;
#define OFS_NULL 0
#define OFS_RETURN 1
#define OFS_PARM0 4 // leave 3 ofs for each parm to hold vectors
#define OFS_PARM1 7
#define OFS_PARM2 10
#define OFS_PARM3 13
#define OFS_PARM4 16
#define OFS_PARM5 19
#define OFS_PARM6 22
#define OFS_PARM7 25
#define RESERVED_OFS 28
enum {
OP_DONE,
OP_MUL_F,
OP_MUL_V,
OP_MUL_FV,
OP_MUL_VF,
OP_DIV_F,
OP_ADD_F,
OP_ADD_V,
OP_SUB_F,
OP_SUB_V,
OP_EQ_F,
OP_EQ_V,
OP_EQ_S,
OP_EQ_E,
OP_EQ_FNC,
OP_NE_F,
OP_NE_V,
OP_NE_S,
OP_NE_E,
OP_NE_FNC,
OP_LE,
OP_GE,
OP_LT,
OP_GT,
OP_LOAD_F,
OP_LOAD_V,
OP_LOAD_S,
OP_LOAD_ENT,
OP_LOAD_FLD,
OP_LOAD_FNC,
OP_ADDRESS,
OP_STORE_F,
OP_STORE_V,
OP_STORE_S,
OP_STORE_ENT,
OP_STORE_FLD,
OP_STORE_FNC,
OP_STOREP_F,
OP_STOREP_V,
OP_STOREP_S,
OP_STOREP_ENT,
OP_STOREP_FLD,
OP_STOREP_FNC,
OP_RETURN,
OP_NOT_F,
OP_NOT_V,
OP_NOT_S,
OP_NOT_ENT,
OP_NOT_FNC,
OP_IF,
OP_IFNOT,
OP_CALL0,
OP_CALL1,
OP_CALL2,
OP_CALL3,
OP_CALL4,
OP_CALL5,
OP_CALL6,
OP_CALL7,
OP_CALL8,
OP_STATE,
OP_GOTO,
OP_AND,
OP_OR,
OP_BITAND,
OP_BITOR
};
typedef struct statement_s
{
unsigned short op;
short a,b,c;
} dstatement_t;
typedef struct
{
unsigned short type; // if DEF_SAVEGLOBGAL bit is set
// the variable needs to be saved in savegames
unsigned short ofs;
int s_name;
} ddef_t;
#define DEF_SAVEGLOBGAL (1<<15)
#define MAX_PARMS 8
typedef struct
{
int first_statement; // negative numbers are builtins
int parm_start;
int locals; // total ints of parms + locals
int profile; // runtime
int s_name;
int s_file; // source file defined in
int numparms;
byte parm_size[MAX_PARMS];
} dfunction_t;
#define PROG_VERSION 6
typedef struct
{
int version;
int crc; // check of header file
int ofs_statements;
int numstatements; // statement 0 is an error
int ofs_globaldefs;
int numglobaldefs;
int ofs_fielddefs;
int numfielddefs;
int ofs_functions;
int numfunctions; // function 0 is an empty
int ofs_strings;
int numstrings; // first string is a null string
int ofs_globals;
int numglobals;
int entityfields;
} dprograms_t;

2
tools/qfcc/include/qfcc.h
View file

@ -22,7 +22,7 @@
#include <stdio.h>
#include <setjmp.h>
#include "pr_comp.h"
#include "QF/pr_comp.h"
/*

6
tools/qfcc/source/Makefile.am
View file

@ -28,8 +28,10 @@
#
AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include
INCLUDES= -I$(top_srcdir)/include $(QF_INCL)
bin_PROGRAMS= qfcc
qfcc_SOURCES= cmdlib.c pr_comp.c pr_lex.c qfcc.c
qfcc_SOURCES= cmdlib.c pr_comp.c pr_lex.c qfcc.c
qfcc_LDADD= $(QF_LIBS)
qfcc_DEPENDENCIES= $(QF_DEPS)

137
tools/qfcc/source/cmdlib.c
View file

@ -289,143 +289,6 @@ LoadFile (char *filename, void **bufferptr)
return length;
}
/*
============================================================================
BYTE ORDER FUNCTIONS
============================================================================
*/
#ifdef WORDS_BIGENDIAN
short
LittleShort (short l)
{
byte b1, b2;
b1 = l & 255;
b2 = (l >> 8) & 255;
return (b1 << 8) + b2;
}
short
BigShort (short l)
{
return l;
}
int
LittleLong (int l)
{
byte b1, b2, b3, b4;
b1 = l & 255;
b2 = (l >> 8) & 255;
b3 = (l >> 16) & 255;
b4 = (l >> 24) & 255;
return ((int) b1 << 24) + ((int) b2 << 16) + ((int) b3 << 8) + b4;
}
int
BigLong (int l)
{
return l;
}
float
LittleFloat (float l)
{
union {
byte b[4];
float f;
} in, out;
in.f = l;
out.b[0] = in.b[3];
out.b[1] = in.b[2];
out.b[2] = in.b[1];
out.b[3] = in.b[0];
return out.f;
}
float
BigFloat (float l)
{
return l;
}
#else
short
BigShort (short l)
{
byte b1, b2;
b1 = l & 255;
b2 = (l >> 8) & 255;
return (b1 << 8) + b2;
}
short
LittleShort (short l)
{
return l;
}
int
BigLong (int l)
{
byte b1, b2, b3, b4;
b1 = l & 255;
b2 = (l >> 8) & 255;
b3 = (l >> 16) & 255;
b4 = (l >> 24) & 255;
return ((int) b1 << 24) + ((int) b2 << 16) + ((int) b3 << 8) + b4;
}
int
LittleLong (int l)
{
return l;
}
float
BigFloat (float l)
{
union {
byte b[4];
float f;
} in, out;
in.f = l;
out.b[0] = in.b[3];
out.b[1] = in.b[2];
out.b[2] = in.b[1];
out.b[3] = in.b[0];
return out.f;
}
float
LittleFloat (float l)
{
return l;
}
#endif
//=======================================================

8
tools/qfcc/source/pr_comp.c
View file

@ -349,7 +349,7 @@ PR_ParseFunctionCall (def_t *func)
t = func->type;
if (t->type != ev_function)
if (t->type != ev_func)
PR_ParseError ("not a function");
// copy the arguments to the global parameter variables
@ -440,7 +440,7 @@ PR_Term (void)
return PR_Statement (&pr_opcodes[OP_NOT_ENT], e, 0);
case ev_vector:
return PR_Statement (&pr_opcodes[OP_NOT_V], e, 0);
case ev_function:
case ev_func:
return PR_Statement (&pr_opcodes[OP_NOT_FNC], e, 0);
default:
PR_ParseError ("Type mismatch for !");
@ -839,7 +839,7 @@ PR_ParseDefs (void)
type = PR_ParseType ();
if (pr_scope && (type->type == ev_field || type->type == ev_function))
if (pr_scope && (type->type == ev_field || type->type == ev_func))
PR_ParseError ("Fields and functions must be global");
do {
@ -852,7 +852,7 @@ PR_ParseDefs (void)
if (def->initialized)
PR_ParseError ("%s redeclared", name);
if (type->type == ev_function) {
if (type->type == ev_func) {
locals_start = locals_end = numpr_globals;
pr_scope = def;
f = PR_ParseImmediateStatements (type);

4
tools/qfcc/source/pr_lex.c
View file

@ -62,7 +62,7 @@ type_t type_vector = { ev_vector, &def_vector };
type_t type_entity = { ev_entity, &def_entity };
type_t type_field = { ev_field, &def_field };
// type_function is a void() function used for state defs
type_t type_function = { ev_function, &def_function, NULL, &type_void };
type_t type_function = { ev_func, &def_function, NULL, &type_void };
type_t type_pointer = { ev_pointer, &def_pointer };
type_t type_floatfield = { ev_field, &def_field, NULL, &type_float };
@ -649,7 +649,7 @@ PR_ParseType (void)
// function type
memset (&new, 0, sizeof (new));
new.type = ev_function;
new.type = ev_func;
new.aux_type = type; // return type
new.num_parms = 0;
if (!PR_Check (tt_punct, ")")) {

25
tools/qfcc/source/qfcc.c
View file

@ -30,9 +30,11 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "QF/qendian.h"
#include "qfcc.h"
char sourcedir[1024];
char destfile[1024];
@ -204,7 +206,7 @@ WriteData (int crc)
int i;
for (def = pr.def_head.next; def; def = def->next) {
if (def->type->type == ev_function) {
if (def->type->type == ev_func) {
// df = &functions[numfunctions];
// numfunctions++;
} else if (def->type->type == ev_field) {
@ -220,9 +222,9 @@ WriteData (int crc)
dd->type = def->type->type;
if (!def->initialized
&& def->type->type != ev_function
&& def->type->type != ev_func
&& def->type->type != ev_field && def->scope == NULL)
dd->type |= DEF_SAVEGLOBGAL;
dd->type |= DEF_SAVEGLOBAL;
dd->s_name = CopyString (def->name);
dd->ofs = def->ofs;
}
@ -392,7 +394,7 @@ PR_ValueString (etype_t type, void *val)
case ev_entity:
sprintf (line, "entity %i", *(int *) val);
break;
case ev_function:
case ev_func:
if (!(f = functions + *(int *) val))
sprintf (line, "undefined function");
else
@ -468,7 +470,7 @@ PR_GlobalString (gofs_t ofs)
if (!(def = pr_global_defs[ofs]))
return PR_GlobalStringNoContents (ofs);
if (def->initialized && def->type->type != ev_function) {
if (def->initialized && def->type->type != ev_func) {
s = PR_ValueString (def->type->type, &pr_globals[ofs]);
sprintf (line, "%i(%s)", ofs, s);
} else {
@ -582,7 +584,7 @@ PR_FinishCompilation (void)
// check to make sure all functions prototyped have code
for (d = pr.def_head.next; d; d = d->next) {
if (d->type->type == ev_function && !d->scope) { // function args ok
if (d->type->type == ev_func && !d->scope) { // function args ok
// f = G_FUNCTION(d->ofs);
// if (!f || (!f->code && !f->builtin))
if (!d->initialized) {
@ -633,7 +635,7 @@ PR_WriteProgdefs (char *filename)
case ev_string:
fprintf (f, "\tstring_t\t%s;\n", d->name);
break;
case ev_function:
case ev_func:
fprintf (f, "\tfunc_t\t%s;\n", d->name);
break;
case ev_entity:
@ -666,7 +668,7 @@ PR_WriteProgdefs (char *filename)
case ev_string:
fprintf (f, "\tstring_t\t%s;\n", d->name);
break;
case ev_function:
case ev_func:
fprintf (f, "\tfunc_t\t%s;\n", d->name);
break;
case ev_entity:
@ -752,12 +754,12 @@ Options: \n\
-h, --help display this help and exit\n\
-V, --version output version information and exit\n\
");
return;
return 1;
}
if (CheckParm ("-V") || CheckParm ("--version")) {
printf ("%s version %s\n", PACKAGE, VERSION);
return;
return 1;
}
if ((p = CheckParm ("--source")) && p < argc - 1) {
@ -796,7 +798,7 @@ Options: \n\
LoadFile (filename, (void *) &src2);
if (!PR_CompileFile (src2, filename))
exit (1);
return 1;
}
if (!PR_FinishCompilation ())
@ -813,4 +815,5 @@ Options: \n\
stop = I_FloatTime ();
printf ("Compilation time: %i seconds.\n", (int) (stop - start));
return 0;
}