zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- minor cleanups in header file

This commit is contained in:
Magnus Norddahl 2018-09-13 02:38:51 +02:00
parent ef170883ef
commit fad8c9c7b4
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/scripting/vm/jit.cpp
View File

@ -92,10 +92,15 @@ JitFuncPtr JitCompile(VMScriptFunction *sfunc)
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
static const char *OpNames[NUM_OPS] =
{
#define xx(op, name, mode, alt, kreg, ktype) #op
#include "vmops.h"
#undef xx
};
void JitCompiler::Codegen() void JitCompiler::Codegen()
{ {
using namespace asmjit;
Setup(); Setup();
pc = sfunc->Code; pc = sfunc->Code;

11
src/scripting/vm/jitintern.h
View File

@ -24,13 +24,6 @@ extern int VMCalls[10];
#define ABCs (pc[0].i24) #define ABCs (pc[0].i24)
#define JMPOFS(x) ((x)->i24) #define JMPOFS(x) ((x)->i24)
static const char *OpNames[NUM_OPS] =
{
#define xx(op, name, mode, alt, kreg, ktype) #op
#include "vmops.h"
#undef xx
};
class JitCompiler class JitCompiler
{ {
public: public:
@ -46,15 +39,15 @@ private:
#include "vmops.h" #include "vmops.h"
#undef xx #undef xx
void Setup();
void EmitOpcode(); void EmitOpcode();
void EmitDoCall(asmjit::X86Gp ptr); void EmitDoCall(asmjit::X86Gp ptr);
void StoreInOuts(int b); void StoreInOuts(int b);
void LoadReturns(const VMOP *retval, int numret, bool inout); void LoadReturns(const VMOP *retval, int numret, bool inout);
void FillReturns(const VMOP *retval, int numret); void FillReturns(const VMOP *retval, int numret);
static int DoCall(VMFrameStack *stack, VMFunction *call, int b, int c, VMValue *param, VMReturn *returns, JitExceptionInfo *exceptinfo); static int DoCall(VMFrameStack *stack, VMFunction *call, int b, int c, VMValue *param, VMReturn *returns, JitExceptionInfo *exceptinfo);
void Setup();
template <typename Func> template <typename Func>
void EmitComparisonOpcode(Func jmpFunc) void EmitComparisonOpcode(Func jmpFunc)
{ {