REVERTERINO

Author: JamieD1

byond-extools/src/core/byond_constants.h

@@ -18,17 +18,9 @@ enum DataType : uint8_t
 	WORLD_D = 0x0E,
 	LIST = 0x0F,
 	LIST_ARGS = 0x10,
-	LIST_MOB_VERBS = 0x11,
 	LIST_VERBS = 0x12,
-	LIST_TURF_VERBS = 0x13,
-	LIST_AREA_VERBS = 0x14,
-	LIST_CLIENT_VERBS = 0x15,
-	LIST_SAVEFILE_DIR = 0x16,
-	LIST_MOB_CONTENTS = 0x17,
 	LIST_TURF_CONTENTS = 0x18,
-	LIST_AREA_CONTENTS = 0x19,
 	LIST_WORLD_CONTENTS = 0x1A,
-	LIST_GROUP = 0x1B,
 	LIST_CONTENTS = 0x1C,
 	DATUM_TYPEPATH = 0x20,
 	DATUM = 0x21,
@@ -41,36 +33,8 @@ enum DataType : uint8_t
 	NUMBER = 0x2A,
 	LIST_MOB_VARS = 0x2C,
 	LIST_OBJ_VARS = 0x2D,
-	LIST_TURF_VARS = 0x2E,
-	LIST_AREA_VARS = 0x2F,
-	LIST_CLIENT_VARS = 0x30,
-	LIST_VARS = 0x31, //maybe?
-	LIST_MOB_OVERLAYS = 0x32,
-	LIST_MOB_UNDERLAYS = 0x33,
-	LIST_OVERLAYS = 0x34,
-	LIST_UNDERLAYS = 0x35,
-	LIST_TURF_OVERLAYS = 0x36,
-	LIST_TURF_UNDERLAYS = 0x37,
-	LIST_AREA_OVERLAYS = 0x38,
-	LIST_AREA_UNDERLAYS = 0x39,
 	APPEARANCE = 0x3A,
 	CLIENT_TYPEPATH = 0x3B,
-	IMAGE_TYPEPATH = 0x3F,
-	LIST_IMAGE_OVERLAYS = 0x40,
-	LIST_IMAGE_UNDERLAYS = 0x41,
-	LIST_IMAGE_VARS = 0x42,
-	LIST_IMAGE_VERBS = 0x43,
-	LIST_IMAGE_CONTENTS = 0x44, // wait wtf
-	LIST_CLIENT_IMAGES = 0x46,
-	LIST_CLIENT_SCREEN = 0x47,
-	LIST_TURF_VIS_CONTENTS = 0x4B,
-	LIST_VIS_CONTENTS = 0x4C,
-	LIST_MOB_VIS_CONTENTS = 0x4D,
-	LIST_TURF_VIS_LOCS = 0x4E,
-	LIST_VIS_LOCS = 0x4F,
-	LIST_MOB_VIS_LOCS = 0x50,
-	LIST_WORLD_VARS = 0x51,
+	LIST_VARS = 0x31, //maybe?
 	LIST_GLOBAL_VARS = 0x52,
-	FILTERS = 0x53,
-	LIST_IMAGE_VIS_CONTENTS = 0x54,
 };

byond-extools/src/core/byond_structures.h

@@ -516,12 +516,6 @@ struct TableHolderThingy
 	unsigned int* elements; //?????
 };
 
-struct TableHolder2
-{
-	void** elements;
-	unsigned int length;
-};
-
 struct VarListEntry;
 
 struct UnknownSimpleLinkedListEntry
@@ -593,11 +587,3 @@ struct VarListEntry
 	std::uint32_t name_id;
 	trvh value;
 };
-
-struct SuspendedProcList
-{
-	ProcConstants** buffer;
-	std::uint32_t front;
-	std::uint32_t back;
-	std::uint32_t max_elements;
-};

byond-extools/src/core/core.cpp

@@ -14,7 +14,6 @@ unsigned int* Core::datum_pointer_table_length;
 
 int ByondVersion;
 int ByondBuild;
-unsigned int* Core::some_flags_including_profile;
 unsigned int Core::extended_profiling_insanely_hacky_check_if_its_a_new_call_or_resume;
 
 //std::vector<bool> Core::codecov_executed_procs;
@@ -25,15 +24,8 @@ unsigned int next_opcode_id = 0x1337;
 bool Core::initialized = false;
 unsigned int* Core::name_table_id_ptr = nullptr;
 unsigned int* Core::name_table = nullptr;
-Value* Core::global_var_table = nullptr;
 std::unordered_map<std::string, Value*> Core::global_direct_cache;
 
-TableHolder2* Core::obj_table = nullptr;
-TableHolder2* Core::datum_table = nullptr;
-TableHolder2* Core::list_table = nullptr;
-TableHolder2* Core::mob_table = nullptr;
-SuspendedProcList* Core::suspended_proc_list = nullptr;
-
 Core::ManagedString::ManagedString(unsigned int id) : string_id(id)
 {
 	string_entry = GetStringTableEntry(string_id);
@@ -118,10 +110,8 @@ void Core::Alert(int what)
 	Alert(std::to_string(what));
 }
 
-unsigned int Core::GetStringId(std::string str, bool increment_refcount)
-{
-	if (ByondVersion > 513)
-	{
+unsigned int Core::GetStringId(std::string str, bool increment_refcount) {
+	if (ByondVersion == 514) {
 		return GetStringTableIndexUTF8(str.c_str(), 0xFFFFFFFF, 0, 1);
 	}
 	return 0;
@@ -167,18 +157,6 @@ void Core::stack_push(Value val)
 	(*Core::current_execution_context_ptr)->stack[(*Core::current_execution_context_ptr)->stack_size-1] = val;
 }
 
-bool Core::enable_profiling()
-{
-	*some_flags_including_profile |= FLAG_PROFILE;
-	return true;
-}
-
-bool Core::disable_profiling()
-{
-	*some_flags_including_profile &= ~FLAG_PROFILE;
-	return true;
-}
-
 std::string Core::type_to_text(unsigned int type)
 {
 	return GetStringFromId(GetTypeById(type)->path);
@@ -219,44 +197,6 @@ std::uint32_t Core::get_socket_from_client(unsigned int id)
 	return ((Hellspawn*)(str - 0x74))->handle;
 }
 
-Value* locate_global_by_name(std::string name)
-{
-	unsigned int varname = Core::GetStringId(name);
-	TableHolderThingy* tht = GetTableHolderThingyById(*Core::name_table_id_ptr);
-	int id;
-	for (id = 0; id < tht->length; id++) // add binary search here
-	{
-		if (Core::name_table[tht->elements[id]] == varname)
-		{
-			break;
-		}
-	}
-	return &Core::global_var_table[tht->elements[id]];
-}
-
-void Core::global_direct_set(std::string name, Value val)
-{
-	if (auto ptr = global_direct_cache.find(name); ptr != global_direct_cache.end())
-	{
-		*ptr->second = val;
-	}
-	Value* var = locate_global_by_name(name);
-	*var = val;
-	global_direct_cache[name] = var;
-}
-
-Value Core::global_direct_get(std::string name)
-{
-	if (auto ptr = global_direct_cache.find(name); ptr != global_direct_cache.end())
-	{
-		return *ptr->second;
-	}
-	Value* var = locate_global_by_name(name);
-	global_direct_cache[name] = var;
-	return *var;
-}
-
-
 void Core::disconnect_client(unsigned int id)
 {
 #ifdef _WIN32

byond-extools/src/core/core.h

@@ -91,22 +91,16 @@ namespace Core
 	extern std::map<std::string, unsigned int> name_to_opcode;
 	extern ExecutionContext** current_execution_context_ptr;
 	extern MiscEntry** misc_entry_table;
-	extern unsigned int* some_flags_including_profile;
 	extern unsigned int* name_table_id_ptr;
 	extern unsigned int* name_table;
-	extern Value* global_var_table;
-	extern TableHolder2* obj_table;
-	extern TableHolder2* datum_table;
-	extern TableHolder2* list_table; //list list honk
-	extern TableHolder2* mob_table;
-	extern SuspendedProcList* suspended_proc_list;
+
+	extern RawDatum*** datum_pointer_table;
+	extern unsigned int* datum_pointer_table_length;
 
 	extern RawDatum*** datum_pointer_table;
 	extern unsigned int* datum_pointer_table_length;
 
 	extern std::unordered_map<std::string, Value*> global_direct_cache;
-	void global_direct_set(std::string name, Value val);
-	Value global_direct_get(std::string name);
 
 
 	//extern std::vector<bool> codecov_executed_procs;
@@ -127,8 +121,6 @@ namespace Core
 	Value get_stack_value(unsigned int which);
 	void stack_pop(unsigned int how_many);
 	void stack_push(Value val);
-	bool enable_profiling();
-	bool disable_profiling();
 	std::string type_to_text(unsigned int type);
 	std::string stringify(Value val);
 	void disconnect_client(unsigned int id);

byond-extools/src/core/core_exports.cpp

@@ -1,17 +1,5 @@
 #include "core.h"
 
-extern "C" EXPORT const char* enable_profiling(int n_args, const char** args)
-{
-	Core::initialize() && Core::enable_profiling();
-	return Core::SUCCESS;
-}
-
-extern "C" EXPORT const char* disable_profiling(int n_args, const char** args)
-{
-	Core::initialize() && Core::disable_profiling();
-	return Core::SUCCESS;
-}
-
 extern "C" EXPORT const char* core_initialize(int n_args, const char** args)
 {
 	if (!Core::initialize())

byond-extools/src/core/various_testing.cpp

@@ -1,6 +1,5 @@
 #include "core.h"
 #include "../dmdism/disassembly.h"
-#include "../debug_server/debug_server.h"
 #include "../crash_guard/crash_guard.h"
 
 #include <fstream>
@@ -78,25 +77,6 @@ class ext_vector : std::vector<T>
 	}
 };
 
-#ifdef _WIN32
-opcode_handler _generate_number_op_localm_localn_store_localx(unsigned char op, int localm, int localn, int localx)
-{
-	unsigned char* func = (unsigned char*)VirtualAlloc(NULL, 64, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
-	if (!func)
-	{
-		return nullptr;
-	}
-	std::memcpy(func, _number_op_localm_localn_store_localx, 26);
-	func[16] = op;
-	func[13] = 4 + 8 * localm;
-	func[18] = 4 + 8 * localn;
-	func[23] = 4 + 8 * localx;
-	DWORD old_prot;
-	VirtualProtect(func, 64, PAGE_EXECUTE_READ, &old_prot);
-	return (opcode_handler)func;
-}
-#endif
-
 extern "C" EXPORT void add_subvars_of_locals(ExecutionContext* ctx)
 {
 	Value a = ctx->local_variables[0];
@@ -123,109 +103,6 @@ void init_testing()
 	{
 		o << i.offset() << "\t\t\t" << i.bytes_str() << "\t\t\t" << i.opcode().mnemonic() << " " << i.comment() << "\n";
 	}
-	//Value a(5.0f);
-	//Value b = a + 5.0f;
-	//b += 1.0f;
-	//Core::Alert(std::to_string(b));
-	//ManagedValue a = Value::World().get("name");
-	//dump_full_obj_mem_usage();
-	//Core::Alert("end func");
-	//Core::global_direct_set("internal_tick_usage", "AYYLMAO");
-	//Core::Alert(Core::global_direct_get("internal_tick_usage"));
-	//Core::Alert(Core::GetStringFromId(0x86));
-	//Core::get_proc("/proc/get_string_by_id").hook(test_invoke);
-	//Core::Alert(Core::get_proc("/client/verb/hidden").proc_table_entry->procFlags);
-	//Core::Alert(Core::get_proc("/client/verb/nothidden").proc_table_entry->procFlags);
-	//Core::get_proc("/client/verb/toggle_hidden_verb").hook(toggle_verb_hidden);
-	//Core::get_proc("/client/verb/hidden").proc_table_entry->procFlags = 4;
-	//initialize_profiler_access();
-	//enable_crash_guard();
-	//optimizer_initialize();
-	//Core::Alert(Core::stringify({ 0x0C, 0x00 }));
-	//Core::Proc p = "/proc/pickdism";
-	//std::ofstream o("out.txt");
-	//for (Instruction& i : p.disassemble())
-	//{
-	//	o << i.offset() << "\t\t\t" << i.bytes_str() << "\t\t\t" << i.opcode().mnemonic() << "\n";
-	//}
-	/*Core::Proc p = "/proc/bench_intrinsic_add";
-	Disassembly d = p.disassemble();
-	Core::Proc intrinsic_add = "/proc/__intrinsic_add_locals";
-	std::vector<std::uint32_t>* new_bytecode = new std::vector<std::uint32_t>;
-	for (int i = 0; i < d.size(); i++)
-	{
-		if (d.at(i) == CALLGLOB && d.at(i).bytes().at(2) == intrinsic_add.id)
-		{
-			Instruction first_arg = d.at(i - 2);
-			Instruction second_arg = d.at(i - 1);
-			Instruction destination = d.at(i + 1);
-			new_bytecode->resize(new_bytecode->size() - 6);
-			int intrinsic_op = Core::register_opcode("INTRINSIC_ADD_NUMBERS_"+std::to_string(rand()), _generate_number_op_localm_localn_store_localx(ADD, first_arg.bytes().at(2), second_arg.bytes().at(2), destination.bytes().at(2)));
-			new_bytecode->push_back(intrinsic_op);
-			i += 1;
-		}
-		else
-		{
-			for (unsigned int& byte : d.at(i).bytes())
-			{
-				new_bytecode->push_back(byte);
-			}
-		}
-	}
-	for (int i = 0; i < 10; i++)
-	{
-		new_bytecode->push_back(0x00);
-	}
-	p.set_bytecode(new_bytecode);
-	std::ofstream o("out.txt");
-	for (Instruction& i : Core::get_proc("/proc/bench_dm_add").disassemble())
-	{
-		o << i.offset() << "\t\t\t" << i.bytes_str() << "\t\t\t" << i.opcode().mnemonic() << "\n";
-	}*//*
-	bool find_unknowns = false;
-	if (find_unknowns)
-	{
-		std::ofstream log("unknown_opcodes.txt");
-		for (Core::Proc& p : Core::get_all_procs())
-		{
-			if (!p.name.empty() && p.name.back() == ')')
-			{
-				continue;
-			}
-			Disassembly d = p.disassemble();
-			for (Instruction& i : d)
-			{
-				if (i == UNK)
-				{
-					log << "Unknown instruction in " + p.name + "\n";
-					break;
-				}
-			}
-		}
-		log.close();
-	}*/
-
-	//debugger_connect();
-	//Core::get_proc("/datum/explosion/New").extended_profile();
-	//Core::get_proc("/client/verb/test_reentry").extended_profile();
-	//Core::get_proc("/client/verb/test_extended_profiling").extended_profile();
-	//extended_profiling_procs[.id] = true;
-	//Core::get_proc("/proc/cheap_hypotenuse_hook").hook(cheap_hypotenuse);
-	//Core::get_proc("/proc/measure_get_variable").hook(measure_get_variable);
-	//Core::get_proc("/proc/laugh").hook(show_profiles);
-
-	/*int hypotenuse_opcode = Core::register_opcode("CHEAP_HYPOTENUSE", cheap_hypotenuse_opcode);
-	Core::Proc& hypotenuse_bench = Core::get_proc("/proc/bench_cheap_hypotenuse_native");
-	Disassembly dis = hypotenuse_bench.disassemble();
-	for (Instruction& instr : dis)
-	{
-		if (instr == Bytecode::CALLGLOB)
-		{
-			instr = Instruction(hypotenuse_opcode);
-			break;
-		}
-	}
-	hypotenuse_bench.assemble(dis);*/
 }
 
 void run_tests()