pretty hilarious optimization

1fbff5f83b23d39d38b1dfcb4cac8d9b · 1fbff5f83b23d39d38b1dfcb4cac8d9b · commit 37e366e6a9a6 · 2019-11-24T02:12:21.000+01:00
diff --git a/byond-extools/src/dmdism/callbacks.h b/byond-extools/src/dmdism/callbacks.h
@@ -15,137 +15,136 @@
 #include "instr_matrix.h"
 #include "instr_debug.h"
 
-#define ADD_CALLBACK(op) { op, []() -> Instruction* { return new Instr_##op(op); } },
+#define ADD_CALLBACK(op) case op: return new Instr_##op(op);
 
-const std::map<Bytecode, std::type_index> type_callbacks = {
-
-};
-
-const std::map<Bytecode, std::function<Instruction*()>> callbacks = {
-	ADD_CALLBACK(END)
-	ADD_CALLBACK(NEW)
-	ADD_CALLBACK(FORMAT)
-	ADD_CALLBACK(OUTPUT)
-	ADD_CALLBACK(OUTPUT_FORMAT)
-	ADD_CALLBACK(TEST)
-	ADD_CALLBACK(NOT)
-	ADD_CALLBACK(JMP)
-	ADD_CALLBACK(JZ)
-	ADD_CALLBACK(RET)
-	ADD_CALLBACK(NEWLIST)
-	ADD_CALLBACK(SLEEP)
-	ADD_CALLBACK(SPAWN)
-	ADD_CALLBACK(CALL)
-	ADD_CALLBACK(CALLNR)
-	ADD_CALLBACK(CALLPATH)
-	ADD_CALLBACK(CALLPARENT)
-	ADD_CALLBACK(CALLGLOB)
-	ADD_CALLBACK(GETVAR)
-	ADD_CALLBACK(SETVAR)
-	ADD_CALLBACK(GETFLAG)
-	ADD_CALLBACK(TEQ)
-	ADD_CALLBACK(TNE)
-	ADD_CALLBACK(TL)
-	ADD_CALLBACK(TG)
-	ADD_CALLBACK(TLE)
-	ADD_CALLBACK(TGE)
-	ADD_CALLBACK(ANEG)
-	ADD_CALLBACK(ADD)
-	ADD_CALLBACK(SUB)
-	ADD_CALLBACK(MUL)
-	ADD_CALLBACK(DIV)
-	ADD_CALLBACK(MOD)
-	ADD_CALLBACK(ROUND)
-	ADD_CALLBACK(ROUNDN)
-	ADD_CALLBACK(AUGADD)
-	ADD_CALLBACK(AUGSUB)
-	ADD_CALLBACK(AUGMUL)
-	ADD_CALLBACK(AUGDIV)
-	ADD_CALLBACK(AUGMOD)
-	ADD_CALLBACK(AUGAND)
-	ADD_CALLBACK(AUGOR)
-	ADD_CALLBACK(AUGXOR)
-	ADD_CALLBACK(AUGLSHIFT)
-	ADD_CALLBACK(AUGRSHIFT)
-	ADD_CALLBACK(PUSHI)
-	ADD_CALLBACK(POP)
-	ADD_CALLBACK(ITERLOAD)
-	ADD_CALLBACK(ITERNEXT)
-	ADD_CALLBACK(LOCATE_POS)
-	ADD_CALLBACK(LOCATE_REF)
-	ADD_CALLBACK(PUSHVAL)
-	ADD_CALLBACK(INC)
-	ADD_CALLBACK(DEC)
-	ADD_CALLBACK(SQRT)
-	ADD_CALLBACK(POW)
-	ADD_CALLBACK(FINDTEXT)
-	ADD_CALLBACK(LISTGET)
-	ADD_CALLBACK(LISTSET)
-	ADD_CALLBACK(ISTYPE)
-	ADD_CALLBACK(DBG_FILE)
-	ADD_CALLBACK(DBG_LINENO)
-	ADD_CALLBACK(ISNULL)
-	ADD_CALLBACK(ISINLIST)
-	ADD_CALLBACK(CALLNAME)
-	ADD_CALLBACK(PROMPTCHECK)
-	ADD_CALLBACK(INPUT_)
-	ADD_CALLBACK(CALL_GLOBAL_ARGLIST)
-	ADD_CALLBACK(ICON_NEW)
-	ADD_CALLBACK(JMP2)
-	ADD_CALLBACK(JNZ)
-	ADD_CALLBACK(JNZ2)
-	ADD_CALLBACK(JZ2)
-	ADD_CALLBACK(POPN)
-	ADD_CALLBACK(CHECKNUM)
-	ADD_CALLBACK(FOR_RANGE)
-	ADD_CALLBACK(MD5)
-	ADD_CALLBACK(CALL_LIB)
-	ADD_CALLBACK(CALL_LIB_ARGLIST)
-	ADD_CALLBACK(ICON_BLEND)
-	ADD_CALLBACK(MATRIX_NEW)
-	ADD_CALLBACK(REPLACETEXT)
-	ADD_CALLBACK(REGEX_NEW)
-	ADD_CALLBACK(FEXISTS)
-	ADD_CALLBACK(COPYTEXT)
-	ADD_CALLBACK(ABS)
-	ADD_CALLBACK(POST_INC)
-	ADD_CALLBACK(FCOPY_RSC)
-	ADD_CALLBACK(ICON_STATES_MODE)
-	ADD_CALLBACK(CRASH)
-	ADD_CALLBACK(ISNUM)
-	ADD_CALLBACK(JMP_OR)
-	ADD_CALLBACK(JMP_AND)
-	ADD_CALLBACK(PROB)
-	ADD_CALLBACK(RAND)
-	ADD_CALLBACK(RAND_RANGE)
-	ADD_CALLBACK(BLOCK)
-	ADD_CALLBACK(STAT)
-	ADD_CALLBACK(LOG)
-	ADD_CALLBACK(LOG10)
-	ADD_CALLBACK(SIN)
-	ADD_CALLBACK(COS)
-	ADD_CALLBACK(MIN)
-	ADD_CALLBACK(MAX)
-	ADD_CALLBACK(MIN_LIST)
-	ADD_CALLBACK(MAX_LIST)
-	ADD_CALLBACK(LOCATE_TYPE)
-	ADD_CALLBACK(BINARY_AND)
-	ADD_CALLBACK(BINARY_OR)
-	ADD_CALLBACK(BINARY_XOR)
-	ADD_CALLBACK(BITWISE_NOT)
-	ADD_CALLBACK(LSHIFT)
-	ADD_CALLBACK(RSHIFT)
-	ADD_CALLBACK(LENGTH)
-	ADD_CALLBACK(PICK)
-	ADD_CALLBACK(ISPATH)
-	ADD_CALLBACK(ISSUBPATH)
-	ADD_CALLBACK(TYPESOF)
-	ADD_CALLBACK(NEW_IMAGE)
-	ADD_CALLBACK(PRE_INC)
-	ADD_CALLBACK(POST_INC)
-	ADD_CALLBACK(PRE_DEC)
-	ADD_CALLBACK(POST_DEC)
-	ADD_CALLBACK(LPUSH_CACHE)
-	ADD_CALLBACK(SET_CACHE)
-	ADD_CALLBACK(SWITCH)
-};
+__forceinline Instruction* get_instr(std::uint32_t op) {
+	switch (op)
+	{
+		ADD_CALLBACK(END)
+		ADD_CALLBACK(NEW)
+		ADD_CALLBACK(FORMAT)
+		ADD_CALLBACK(OUTPUT)
+		ADD_CALLBACK(OUTPUT_FORMAT)
+		ADD_CALLBACK(TEST)
+		ADD_CALLBACK(NOT)
+		ADD_CALLBACK(JMP)
+		ADD_CALLBACK(JZ)
+		ADD_CALLBACK(RET)
+		ADD_CALLBACK(NEWLIST)
+		ADD_CALLBACK(SLEEP)
+		ADD_CALLBACK(SPAWN)
+		ADD_CALLBACK(CALL)
+		ADD_CALLBACK(CALLNR)
+		ADD_CALLBACK(CALLPATH)
+		ADD_CALLBACK(CALLPARENT)
+		ADD_CALLBACK(CALLGLOB)
+		ADD_CALLBACK(GETVAR)
+		ADD_CALLBACK(SETVAR)
+		ADD_CALLBACK(GETFLAG)
+		ADD_CALLBACK(TEQ)
+		ADD_CALLBACK(TNE)
+		ADD_CALLBACK(TL)
+		ADD_CALLBACK(TG)
+		ADD_CALLBACK(TLE)
+		ADD_CALLBACK(TGE)
+		ADD_CALLBACK(ANEG)
+		ADD_CALLBACK(ADD)
+		ADD_CALLBACK(SUB)
+		ADD_CALLBACK(MUL)
+		ADD_CALLBACK(DIV)
+		ADD_CALLBACK(MOD)
+		ADD_CALLBACK(ROUND)
+		ADD_CALLBACK(ROUNDN)
+		ADD_CALLBACK(AUGADD)
+		ADD_CALLBACK(AUGSUB)
+		ADD_CALLBACK(AUGMUL)
+		ADD_CALLBACK(AUGDIV)
+		ADD_CALLBACK(AUGMOD)
+		ADD_CALLBACK(AUGAND)
+		ADD_CALLBACK(AUGOR)
+		ADD_CALLBACK(AUGXOR)
+		ADD_CALLBACK(AUGLSHIFT)
+		ADD_CALLBACK(AUGRSHIFT)
+		ADD_CALLBACK(PUSHI)
+		ADD_CALLBACK(POP)
+		ADD_CALLBACK(ITERLOAD)
+		ADD_CALLBACK(ITERNEXT)
+		ADD_CALLBACK(LOCATE_POS)
+		ADD_CALLBACK(LOCATE_REF)
+		ADD_CALLBACK(PUSHVAL)
+		ADD_CALLBACK(INC)
+		ADD_CALLBACK(DEC)
+		ADD_CALLBACK(SQRT)
+		ADD_CALLBACK(POW)
+		ADD_CALLBACK(FINDTEXT)
+		ADD_CALLBACK(LISTGET)
+		ADD_CALLBACK(LISTSET)
+		ADD_CALLBACK(ISTYPE)
+		ADD_CALLBACK(DBG_FILE)
+		ADD_CALLBACK(DBG_LINENO)
+		ADD_CALLBACK(ISNULL)
+		ADD_CALLBACK(ISINLIST)
+		ADD_CALLBACK(CALLNAME)
+		ADD_CALLBACK(PROMPTCHECK)
+		ADD_CALLBACK(INPUT_)
+		ADD_CALLBACK(CALL_GLOBAL_ARGLIST)
+		ADD_CALLBACK(ICON_NEW)
+		ADD_CALLBACK(JMP2)
+		ADD_CALLBACK(JNZ)
+		ADD_CALLBACK(JNZ2)
+		ADD_CALLBACK(JZ2)
+		ADD_CALLBACK(POPN)
+		ADD_CALLBACK(CHECKNUM)
+		ADD_CALLBACK(FOR_RANGE)
+		ADD_CALLBACK(MD5)
+		ADD_CALLBACK(CALL_LIB)
+		ADD_CALLBACK(CALL_LIB_ARGLIST)
+		ADD_CALLBACK(ICON_BLEND)
+		ADD_CALLBACK(MATRIX_NEW)
+		ADD_CALLBACK(REPLACETEXT)
+		ADD_CALLBACK(REGEX_NEW)
+		ADD_CALLBACK(FEXISTS)
+		ADD_CALLBACK(COPYTEXT)
+		ADD_CALLBACK(ABS)
+		ADD_CALLBACK(FCOPY_RSC)
+		ADD_CALLBACK(ICON_STATES_MODE)
+		ADD_CALLBACK(CRASH)
+		ADD_CALLBACK(ISNUM)
+		ADD_CALLBACK(JMP_OR)
+		ADD_CALLBACK(JMP_AND)
+		ADD_CALLBACK(PROB)
+		ADD_CALLBACK(RAND)
+		ADD_CALLBACK(RAND_RANGE)
+		ADD_CALLBACK(BLOCK)
+		ADD_CALLBACK(STAT)
+		ADD_CALLBACK(LOG)
+		ADD_CALLBACK(LOG10)
+		ADD_CALLBACK(SIN)
+		ADD_CALLBACK(COS)
+		ADD_CALLBACK(MIN)
+		ADD_CALLBACK(MAX)
+		ADD_CALLBACK(MIN_LIST)
+		ADD_CALLBACK(MAX_LIST)
+		ADD_CALLBACK(LOCATE_TYPE)
+		ADD_CALLBACK(BINARY_AND)
+		ADD_CALLBACK(BINARY_OR)
+		ADD_CALLBACK(BINARY_XOR)
+		ADD_CALLBACK(BITWISE_NOT)
+		ADD_CALLBACK(LSHIFT)
+		ADD_CALLBACK(RSHIFT)
+		ADD_CALLBACK(LENGTH)
+		ADD_CALLBACK(PICK)
+		ADD_CALLBACK(ISPATH)
+		ADD_CALLBACK(ISSUBPATH)
+		ADD_CALLBACK(TYPESOF)
+		ADD_CALLBACK(NEW_IMAGE)
+		ADD_CALLBACK(PRE_INC)
+		ADD_CALLBACK(POST_INC)
+		ADD_CALLBACK(PRE_DEC)
+		ADD_CALLBACK(POST_DEC)
+		ADD_CALLBACK(LPUSH_CACHE)
+		ADD_CALLBACK(SET_CACHE)
+		ADD_CALLBACK(SWITCH)
+	}
+	return new Instr_UNK;
+}
diff --git a/byond-extools/src/dmdism/disassembler.cpp b/byond-extools/src/dmdism/disassembler.cpp
@@ -34,19 +34,17 @@ Disassembly Disassembler::disassemble()
 
 Instruction Disassembler::disassemble_next()
 {
-	Instruction* instr = nullptr;
-
 	auto root = context_->eat();
-
-	auto cb = callbacks.find(static_cast<Bytecode>(root));
+	Instruction* instr = get_instr(root);
+	/*auto cb = callbacks.find(static_cast<Bytecode>(root));
 	if (cb != callbacks.end())
 	{
 		instr = cb->second();
 	}
 	else
 	{
 		instr = new Instr_UNK;
-	}
+	}*/
 
 	context_->set_instr(instr);
 	instr->add_byte(root);

Original file line number	Diff line number	Diff line change
`@@ -34,19 +34,17 @@ Disassembly Disassembler::disassemble()`
`34`	`34`
`35`	`35`	`Instruction Disassembler::disassemble_next()`
`36`	`36`	`{`
`37`		`- Instruction* instr = nullptr;`
`38`		`-`
`39`	`37`	`auto root = context_->eat();`
`40`		`-`
`41`		`- auto cb = callbacks.find(static_cast<Bytecode>(root));`
	`38`	`+ Instruction* instr = get_instr(root);`
	`39`	`+ /*auto cb = callbacks.find(static_cast<Bytecode>(root));`
`42`	`40`	`if (cb != callbacks.end())`
`43`	`41`	`{`
`44`	`42`	`instr = cb->second();`
`45`	`43`	`}`
`46`	`44`	`else`
`47`	`45`	`{`
`48`	`46`	`instr = new Instr_UNK;`
`49`		`- }`
	`47`	`+ }*/`
`50`	`48`
`51`	`49`	`context_->set_instr(instr);`
`52`	`50`	`instr->add_byte(root);`