llcppsymg:symbol generate test

llcppsymg:symbo test

llcppsymg:exist symb file test

llcppsymg:GenSymbolTabledata

llcppsymg:GenSymbolTableData test

llcppsymg:full symg operation test

chore/_xtool/llcppsymg/llcppsymg.go

@@ -17,25 +17,20 @@
 package main
 
 import (
-	"errors"
 	"fmt"
 	"io"
 	"os"
-	"strings"
-	"unsafe"
 
-	"github.com/goplus/llgo/c"
-	"github.com/goplus/llgo/c/cjson"
 	"github.com/goplus/llgo/chore/_xtool/llcppsymg/config"
 	"github.com/goplus/llgo/chore/_xtool/llcppsymg/dylib"
 	"github.com/goplus/llgo/chore/_xtool/llcppsymg/header"
 	"github.com/goplus/llgo/chore/_xtool/llcppsymg/parse"
-	"github.com/goplus/llgo/chore/llcppg/types"
-	"github.com/goplus/llgo/xtool/nm"
+	"github.com/goplus/llgo/chore/_xtool/llcppsymg/symbol"
 )
 
 func main() {
 	cfgFile := "llcppg.cfg"
+	symbFile := "llcppg.symb.json"
 	if len(os.Args) > 1 {
 		cfgFile = os.Args[1]
 	}
@@ -63,9 +58,10 @@ func main() {
 	headerInfos, err := parse.ParseHeaderFile(filepaths, conf.TrimPrefixes, conf.Cplusplus, false)
 	check(err)
 
-	symbolInfo := getCommonSymbols(symbols, headerInfos, conf.TrimPrefixes)
+	symbolData, err := symbol.GenerateAndUpdateSymbolTable(symbols, headerInfos, symbFile)
+	check(err)
 
-	err = genSymbolTableFile(symbolInfo)
+	err = os.WriteFile(symbFile, symbolData, 0644)
 	check(err)
 }
 
@@ -74,92 +70,3 @@ func check(err error) {
 		panic(err)
 	}
 }
-
-func getCommonSymbols(dylibSymbols []*nm.Symbol, symbolMap map[string]*parse.SymbolInfo, prefix []string) []*types.SymbolInfo {
-	var commonSymbols []*types.SymbolInfo
-	for _, dylibSym := range dylibSymbols {
-		symName := strings.TrimPrefix(dylibSym.Name, "_")
-		if symInfo, ok := symbolMap[symName]; ok {
-			symbolInfo := &types.SymbolInfo{
-				Mangle: symName,
-				CPP:    symInfo.ProtoName,
-				Go:     symInfo.GoName,
-			}
-			commonSymbols = append(commonSymbols, symbolInfo)
-		}
-	}
-	return commonSymbols
-}
-
-func genSymbolTableFile(symbolInfos []*types.SymbolInfo) error {
-	fileName := "llcppg.symb.json"
-	existingSymbols, err := readExistingSymbolTable(fileName)
-	if err != nil {
-		return err
-	}
-
-	for i := range symbolInfos {
-		if existingSymbol, exists := existingSymbols[symbolInfos[i].Mangle]; exists {
-			symbolInfos[i].Go = existingSymbol.Go
-		}
-	}
-
-	root := cjson.Array()
-	defer root.Delete()
-
-	for _, symbol := range symbolInfos {
-		item := cjson.Object()
-		item.SetItem(c.Str("mangle"), cjson.String(c.AllocaCStr(symbol.Mangle)))
-		item.SetItem(c.Str("c++"), cjson.String(c.AllocaCStr(symbol.CPP)))
-		item.SetItem(c.Str("go"), cjson.String(c.AllocaCStr(symbol.Go)))
-		root.AddItem(item)
-	}
-
-	cStr := root.Print()
-	if cStr == nil {
-		return errors.New("symbol table is empty")
-	}
-	defer c.Free(unsafe.Pointer(cStr))
-
-	data := unsafe.Slice((*byte)(unsafe.Pointer(cStr)), c.Strlen(cStr))
-
-	if err := os.WriteFile(fileName, data, 0644); err != nil {
-		return errors.New("failed to write symbol table file")
-	}
-	return nil
-}
-
-func readExistingSymbolTable(fileName string) (map[string]types.SymbolInfo, error) {
-	existingSymbols := make(map[string]types.SymbolInfo)
-
-	if _, err := os.Stat(fileName); err != nil {
-		return existingSymbols, nil
-	}
-
-	data, err := os.ReadFile(fileName)
-	if err != nil {
-		return nil, errors.New("failed to read symbol table file")
-	}
-
-	parsedJSON := cjson.ParseBytes(data)
-	if parsedJSON == nil {
-		return nil, errors.New("failed to parse JSON")
-	}
-
-	arraySize := parsedJSON.GetArraySize()
-
-	for i := 0; i < int(arraySize); i++ {
-		item := parsedJSON.GetArrayItem(c.Int(i))
-		if item == nil {
-			continue
-		}
-		symbol := types.SymbolInfo{
-			Mangle: config.GetStringItem(item, "mangle", ""),
-			CPP:    config.GetStringItem(item, "c++", ""),
-			Go:     config.GetStringItem(item, "go", ""),
-		}
-		existingSymbols[symbol.Mangle] = symbol
-	}
-
-	return existingSymbols, nil
-}