- moved the VM types into their own file and only include it where really needed.

src/scripting/backend/codegen.cpp

@@ -6620,7 +6620,7 @@ ExpEmit FxClassDefaults::Emit(VMFunctionBuilder *build)
 	ob.Free(build);
 	ExpEmit meta(build, REGT_POINTER);
 	build->Emit(OP_CLSS, meta.RegNum, ob.RegNum);
-	build->Emit(OP_LOS, meta.RegNum, meta.RegNum, build->GetConstantInt(myoffsetof(PClass, Defaults)));
+	build->Emit(OP_LP, meta.RegNum, meta.RegNum, build->GetConstantInt(myoffsetof(PClass, Defaults)));
 	return meta;
 
 }
@@ -6878,7 +6878,7 @@ ExpEmit FxStackVariable::Emit(VMFunctionBuilder *build)
 		if (offsetreg == -1) offsetreg = build->GetConstantInt(0);
 		auto op = membervar->Type->GetLoadOp();
 		if (op == OP_LO)
-			op = OP_LOS;
+			op = OP_LP;
 		build->Emit(op, loc.RegNum, build->FramePointer.RegNum, offsetreg);
 	}
 	else
@@ -9355,7 +9355,7 @@ ExpEmit FxGetParentClass::Emit(VMFunctionBuilder *build)
 		op.Free(build);
 	}
 	ExpEmit to(build, REGT_POINTER);
-	build->Emit(OP_LOS, to.RegNum, op.RegNum, build->GetConstantInt(myoffsetof(PClass, ParentClass)));
+	build->Emit(OP_LP, to.RegNum, op.RegNum, build->GetConstantInt(myoffsetof(PClass, ParentClass)));
 	return to;
 }
 
@@ -9427,7 +9427,7 @@ ExpEmit FxGetDefaultByType::Emit(VMFunctionBuilder *build)
 		build->Emit(OP_LKP, to.RegNum, op.RegNum);
 		op = to;
 	}
-	build->Emit(OP_LOS, to.RegNum, op.RegNum, build->GetConstantInt(myoffsetof(PClass, Defaults)));
+	build->Emit(OP_LP, to.RegNum, op.RegNum, build->GetConstantInt(myoffsetof(PClass, Defaults)));
 	return to;
 }
 

src/scripting/backend/codegen.h

@@ -46,6 +46,8 @@
 #include "actor.h"
 #include "vmbuilder.h"
 #include "scopebarrier.h"
+#include "types.h"
+#include "vmintern.h"
 
 
 #define CHECKRESOLVED() if (isresolved) return this; isresolved=true;

src/scripting/backend/dynarrays.cpp

@@ -39,7 +39,9 @@
 
 #include "tarray.h"
 #include "dobject.h"
-#include "thingdef.h"
+#include "vm.h"
+#include "types.h"
+
 // We need one specific type for each of the 7 integral VM types and instantiate the needed functions for each of them.
 // Dynamic arrays cannot hold structs because for every type there'd need to be an internal implementation which is impossible.
 

src/scripting/backend/scopebarrier.cpp

@@ -1,5 +1,7 @@
 #include "dobject.h"
 #include "scopebarrier.h"
+#include "types.h"
+#include "vmintern.h"
 
 
 // Note: the same object can't be both UI and Play. This is checked explicitly in the field construction and will cause esoteric errors here if found.

src/scripting/backend/vmbuilder.cpp

@@ -35,8 +35,9 @@
 #include "codegen.h"
 #include "info.h"
 #include "m_argv.h"
-#include "thingdef.h"
+//#include "thingdef.h"
 #include "doomerrors.h"
+#include "vmintern.h"
 
 struct VMRemap
 {

src/scripting/backend/vmbuilder.h

@@ -2,6 +2,7 @@
 #define VMUTIL_H
 
 #include "dobject.h"
+#include "vmintern.h"
 
 class VMFunctionBuilder;
 class FxExpression;

src/scripting/backend/vmdisasm.cpp

@@ -34,6 +34,7 @@
 #include "dobject.h"
 #include "c_console.h"
 #include "templates.h"
+#include "vmintern.h"
 
 #define NOP		MODE_AUNUSED | MODE_BUNUSED | MODE_CUNUSED