Add support for disassembly and support debug debugger

- Add support for disassembly
- Support debug debugger
- Support auto download luamake
- Update luajit build script

Author: fesily

.clang-format

@@ -15,3 +15,4 @@ NamespaceIndentation: All
 PackConstructorInitializers: Never
 QualifierAlignment: Left
 SpaceBeforeCpp11BracedList: true
+SortIncludes: false

.gitignore

@@ -5,4 +5,5 @@
 /build/
 /extension/package.json
 .DS_Store
-.idea/
+.idea/
+luamake/

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/actboy168/bee.lua.git
 [submodule "3rd/lua/luajit"]
 	path = 3rd/lua/luajit
-	url = https://github.com/fesily/luajit2
+	url = https://github.com/fesily/luajit
 [submodule "3rd/json.lua"]
 	path = 3rd/json.lua
 	url = https://github.com/actboy168/json.lua

.luarc.json

@@ -37,5 +37,9 @@
             "trailing-space": "Warning"
         }
     },
-    "workspace.checkThirdParty": false
+    "workspace.checkThirdParty": false,
+    "type.inferParamType": true,
+    "workspace.library": [
+        "${addons}/bee/module/library"
+    ]
 }

.vscode/settings.json

@@ -1,3 +1,12 @@
 {
     "C_Cpp.autoAddFileAssociations": false,
+    "terminal.integrated.env.linux": {
+        "PATH": "${workspaceFolder}/luamake:${env:PATH}",
+    },
+    "terminal.integrated.env.windows": {
+        "PATH": "${workspaceFolder}/luamake:${env:PATH}",
+    },
+    "terminal.integrated.env.osx": {
+        "PATH": "${workspaceFolder}/luamake:${env:PATH}",
+    }
 }

3rd/lua/luajit

@@ -0,0 +1,26 @@
+
+.PHONY: all download_deps build_luamake init_luamake
+
+all: download_deps build_luamake
+	luamake/luamake build --release
+
+build_luamake: init_luamake
+	@echo "Building luamake..."
+	git submodule update --init --recursive
+	cd luamake && compile/build.sh
+
+download_deps: build_luamake
+	luamake/luamake lua compile/download_deps.lua
+
+init_luamake:
+	@if [ -d "luamake" ]; then \
+		if [ -d "luamake/.git" ]; then \
+			echo "Updating luamake repository..."; \
+			(cd luamake && git pull && git submodule update --remote); \
+		else \
+			echo "Error: 'luamake' exists but is not a Git repository."; \
+		fi; \
+	else \
+		echo "Cloning luamake repository..."; \
+		git clone --recurse-submodules https://github.com/actboy168/luamake.git; \
+	fi

Makefile

@@ -1,4 +1,5 @@
 local lm = require "luamake"
+local fs = require 'bee.filesystem'
 
 local arch = lm.runtime_platform:sub(lm.runtime_platform:find("-") + 1)
 if arch == "ia32" then
@@ -9,12 +10,35 @@ local luaver = "luajit"
 local LUAJIT_ENABLE_LUA52COMPAT = "LUAJIT_ENABLE_LUA52COMPAT"
 local LUAJIT_NUMMODE = "LUAJIT_NUMMODE=2"
 local luajitDir = '3rd/lua/' .. luaver .. "/src"
+local is_old_version_luajit = fs.exists(fs.path(luajitDir) / 'lj_init.c')
 
 local _M = {
 	arch = arch,
 	LUAJIT_ENABLE_LUA52COMPAT = LUAJIT_ENABLE_LUA52COMPAT,
 	LUAJIT_NUMMODE = LUAJIT_NUMMODE,
-	luajitDir = luajitDir
+	luajitDir = luajitDir,
+	is_old_version_luajit = is_old_version_luajit
 }
 
+if not is_old_version_luajit then
+    local sp = require 'bee.subprocess'
+    local fs = require 'bee.filesystem'
+    local sys = require 'bee.sys'
+    sp.spawn({
+        sys.exe_path(),
+        "lua",
+        'compile/luajit/relver.lua',
+        luajitDir.."/..",
+        luajitDir.."/luajit_relver.txt"
+    }):wait()
+    sp.spawn({
+        sys.exe_path(),
+        "lua",
+        luajitDir.."/host/genversion.lua",
+        luajitDir.."/luajit_rolling.h",
+        luajitDir.."/luajit_relver.txt",
+        luajitDir.."/luajit.h"
+    }):wait()
+end
+
 return _M

compile/luajit/defined.lua

@@ -1,4 +1,5 @@
 local lm = require "luamake"
+local fs = require 'bee.filesystem'
 
 local bindir = "publish/runtime/" .. lm.runtime_platform
 
@@ -9,6 +10,7 @@ local arch = defined.arch
 local LUAJIT_ENABLE_LUA52COMPAT = defined.LUAJIT_ENABLE_LUA52COMPAT
 local LUAJIT_NUMMODE = defined.LUAJIT_NUMMODE
 local luajitDir = defined.luajitDir
+local is_old_version_luajit = defined.is_old_version_luajit
 
 local LJLIB_C = {
     luajitDir .. "/lib_base.c ",
@@ -98,35 +100,39 @@ lm:build "lj_vm.obj" {
     outputs = lm.bindir .. "/lj_vm.obj",
 }
 
-local lj_str_hash_flags = {
-    "-fno-stack-protector",
-    U_FORTIFY_SOURCE,
-    "-fPIC",
-}
+local has_str_hash = fs.exists(luajitDir.. '/lj_str_hash.c')
+if has_str_hash then
+    local lj_str_hash_flags = {
+        "-fno-stack-protector",
+        U_FORTIFY_SOURCE,
+        "-fPIC",
+    }
 
-if arch == "x64" then
-    table.insert(lj_str_hash_flags, "-msse4.2")
-end
+    if arch == "x64" then
+        table.insert(lj_str_hash_flags, "-msse4.2")
+    end
 
-lm:source_set("lj_str_hash.c") {
-    rootdir = luajitDir,
-    sources = { "lj_str_hash.c" },
-    includes = { '.' },
-    defines = {
-        LUAJIT_UNWIND_EXTERNAL,
-        _FILE_OFFSET_BITS,
-        _LARGEFILE_SOURCE,
-        LUA_MULTILIB,
-        LUAJIT_ENABLE_LUA52COMPAT,
-        LUAJIT_NUMMODE,
-    },
-    linux = {
+    lm:source_set("lj_str_hash.c") {
+        rootdir = luajitDir,
+        sources = { "lj_str_hash.c" },
+        includes = { '.' },
         defines = {
-            "_GNU_SOURCE",
-        }
-    },
-    flags = lj_str_hash_flags
-}
+            LUAJIT_UNWIND_EXTERNAL,
+            _FILE_OFFSET_BITS,
+            _LARGEFILE_SOURCE,
+            LUA_MULTILIB,
+            LUAJIT_ENABLE_LUA52COMPAT,
+            LUAJIT_NUMMODE,
+        },
+        linux = {
+            defines = {
+                "_GNU_SOURCE",
+            }
+        },
+        flags = lj_str_hash_flags
+    }
+end
+
 
 lm:executable("luajit/lua") {
     rootdir = luajitDir,
@@ -139,12 +145,14 @@ lm:executable("luajit/lua") {
         "lj_libdef.h",
         "lj_recdef.h",
     },
-    deps = "lj_str_hash.c",
+    deps = {
+        has_str_hash and "lj_str_hash.c",
+    },
     sources = {
         "luajit.c",
         "lj_*.c",
         "lib_*.c",
-        "!lj_str_hash.c",
+        has_str_hash and "!lj_str_hash.c",
         lm.bindir .. "/lj_vm.obj",
     },
     includes = {

compile/luajit/make.lua

@@ -67,4 +67,4 @@ lm:executable("buildvm") {
         ".",
         "../../../../" .. lm.bindir
     }
-}
+}