Merge some zcpu stuff with wire + add icons for new tools

lua/autorun/wire_load.lua

@@ -33,6 +33,7 @@ if SERVER then
 	AddCSLuaFile("wire/fpgagates.lua")
 	AddCSLuaFile("wire/cpugates.lua")
 	AddCSLuaFile("wire/wiremonitors.lua")
+	AddCSLuaFile("wire/cpulib.lua")
 	AddCSLuaFile("wire/gpulib.lua")
 	AddCSLuaFile("wire/timedpairs.lua")
 	AddCSLuaFile("wire/default_data_generator.lua")
@@ -69,6 +70,23 @@ if SERVER then
 	AddCSLuaFile("wire/client/node_editor/nodeeditor.lua")
 	AddCSLuaFile("wire/client/node_editor/wire_fpga_editor.lua")
 
+	-- hl-zasm
+	AddCSLuaFile("wire/client/hlzasm/hc_compiler.lua")
+	AddCSLuaFile("wire/client/hlzasm/hc_opcodes.lua")
+	AddCSLuaFile("wire/client/hlzasm/hc_expression.lua")
+	AddCSLuaFile("wire/client/hlzasm/hc_preprocess.lua")
+	AddCSLuaFile("wire/client/hlzasm/hc_syntax.lua")
+	AddCSLuaFile("wire/client/hlzasm/hc_codetree.lua")
+	AddCSLuaFile("wire/client/hlzasm/hc_optimize.lua")
+	AddCSLuaFile("wire/client/hlzasm/hc_output.lua")
+	AddCSLuaFile("wire/client/hlzasm/hc_tokenizer.lua")
+
+	-- zvm
+	AddCSLuaFile("wire/zvm/zvm_core.lua")
+	AddCSLuaFile("wire/zvm/zvm_features.lua")
+	AddCSLuaFile("wire/zvm/zvm_opcodes.lua")
+	AddCSLuaFile("wire/zvm/zvm_data.lua")
+
 	for _, filename in ipairs(file.Find("wire/client/text_editor/modes/*.lua","LUA")) do
 		AddCSLuaFile("wire/client/text_editor/modes/" .. filename)
 	end
@@ -83,6 +101,7 @@ include("wire/wiregates.lua")
 include("wire/fpgagates.lua")
 include("wire/cpugates.lua")
 include("wire/wiremonitors.lua")
+include("wire/cpulib.lua")
 include("wire/gpulib.lua")
 include("wire/timedpairs.lua")
 include("wire/default_data_generator.lua")
@@ -95,6 +114,7 @@ if SERVER then
 	include("wire/server/debuggerlib.lua")
 	include("wire/server/sents_registry.lua")
 	include("wire/server/wire_map_interface.lua")
+	include("wire/zvm/zvm_tests.lua")
 
 	if CreateConVar("wire_force_workshop", "1", FCVAR_ARCHIVE, "Should Wire force all clients to download the Workshop edition of Wire, for models? (requires restart to disable)"):GetBool() then
 		if select(2, WireLib.GetVersion()):find("Workshop", 1, true) then
@@ -130,6 +150,7 @@ if CLIENT then
 	include("wire/client/customspawnmenu.lua")
 	include("wire/client/node_editor/nodeeditor.lua")
 	include("wire/client/node_editor/wire_fpga_editor.lua")
+	include("wire/client/hlzasm/hc_compiler.lua")
 end
 
 if SERVER then print("Wiremod " .. select(2, WireLib.GetVersion()) .. " loaded") end

lua/wire/default_data_generator.lua

@@ -18,11 +18,14 @@ function WireLib.GenerateDefaultData()
 	-- When adding new folders that need to be generated, add them to this list
 	RecursivelyGenerateFolder("data_static/expression2/")
 	RecursivelyGenerateFolder("data_static/fpgachip/")
+	RecursivelyGenerateFolder("data_static/cpuchip/")
+	RecursivelyGenerateFolder("data_static/gpuchip/")
+	RecursivelyGenerateFolder("data_static/spuchip/")
 	RecursivelyGenerateFolder("data_static/soundlists/")
 end
 
 -- Regenerate data files on every structure update
-local DataVersion = 2
+local DataVersion = 3
 
 if cookie.GetNumber("wire_data_version", 0) < DataVersion then
 	cookie.Set("wire_data_version", tostring(DataVersion))

lua/wire/stools/cpu.lua

@@ -11,6 +11,8 @@
     { name = "reload", text = "Attach debugger" },
     { name = "reload_shift", text = "Shift+Reload: Clear" },
   }
+
+  WireToolSetup.setToolMenuIcon("icon16/server.png")
 end
 WireToolSetup.BaseLang()
 WireToolSetup.SetupMax( 7 )
@@ -140,7 +142,7 @@
 
 
     ----------------------------------------------------------------------------
     local currentDirectory
     local FileBrowser = vgui.Create("wire_expression2_browser" , panel)
     panel:AddPanel(FileBrowser)
     FileBrowser:Setup("cpuchip")
@@ -178,7 +180,7 @@
 
 
     ----------------------------------------------------------------------------
     local modelPanel = WireDermaExts.ModelSelect(panel, "wire_cpu_model", list.Get("Wire_gate_Models"), 2)
     panel:AddControl("Label", {Text = ""})
 
 
@@ -387,12 +389,12 @@
       outc(string.format(" RAM %5d KB",collectgarbage("count") or 0),1,Color(255,255,255,255))
 
       surface.SetDrawColor(240, 120, 0, 255)
       surface.DrawRect(16*(5),32*2+14,256,4)
       outc("TASK",2,Color(240, 120,0,255))
       outc("       STATUS",3,Color(255,255,255,255))
 
       surface.SetDrawColor(240, 120, 0, 255)
       surface.DrawRect(16*(4),32*6+14,256,4)
       outc("NET",6,Color(240, 120,0,255))
       if CPULib.Uploading then
         outc(string.format("UP %.3f KB",CPULib.RemainingUploadData/1024),7,Color(255,255,255,255))
@@ -483,9 +485,9 @@
         outform(1,1,7,5,"HL-ZASM")
         outc(string.format("  Stage %d/7",HCOMP.Stage+1),3,Color(0,0,0,255))
         outc("  "..stageNameShort[HCOMP.Stage+1],4,Color(0,0,0,255))
       else
         --
       end
     end
   end
 

lua/wire/stools/fpga.lua

@@ -10,6 +10,8 @@ if CLIENT then
 		{ name = "right", text = "Open editor" },
 		{ name = "reload", text = "Reset" }
 	}
+
+	WireToolSetup.setToolMenuIcon("icon16/application_view_icons.png")
 end
 WireToolSetup.BaseLang()
 WireToolSetup.SetupMax(40)

lua/wire/stools/gpu.lua

@@ -10,6 +10,8 @@
     { name = "right", text = "open editor and/or attach debugger to the ZGPU" },
     { name = "reload", text = "Wipe ROM/RAM and reset memory model" },
   }
+
+  WireToolSetup.setToolMenuIcon("icon16/monitor.png")
 end
 WireToolSetup.BaseLang()
 WireToolSetup.SetupMax( 7 )
@@ -39,7 +41,7 @@
   function TOOL:Reload(trace)
     if trace.Entity:IsPlayer() then return false end
 
     local player = self:GetOwner()
     if (trace.Entity:IsValid()) and
        (trace.Entity:GetClass() == "gmod_wire_gpu") then
       trace.Entity:SetMemoryModel(self:GetClientInfo("memorymodel"))
@@ -119,7 +121,7 @@
 
 
     ----------------------------------------------------------------------------
     local currentDirectory
     local FileBrowser = vgui.Create("wire_expression2_browser" , panel)
     panel:AddPanel(FileBrowser)
     FileBrowser:Setup("GPUChip")

lua/wire/stools/spu.lua

@@ -9,6 +9,8 @@
     { name = "left", text = "Create/reflash " .. TOOL.Name },
     { name = "right", text = "Open editor" },
   }
+
+  WireToolSetup.setToolMenuIcon("icon16/ipod_sound.png")
 end
 WireToolSetup.BaseLang()
 WireToolSetup.SetupMax( 7 )
@@ -38,7 +40,7 @@
   function TOOL:Reload(trace)
     if trace.Entity:IsPlayer() then return false end
 
     local player = self:GetOwner()
     if (trace.Entity:IsValid()) and
        (trace.Entity:GetClass() == "gmod_wire_spu") then
       trace.Entity:SetMemoryModel(self:GetClientInfo("memorymodel"))
@@ -124,7 +126,7 @@
 
 
     ----------------------------------------------------------------------------
     local currentDirectory
     local FileBrowser = vgui.Create("wire_expression2_browser" , panel)
     panel:AddPanel(FileBrowser)
     FileBrowser:Setup("spuchip")