bind sdk fix decode bit start index

bin/debug/SDK/Headers/BasicTypes.h

@@ -17,9 +17,7 @@
 //               Basic Datatypes                //
 //////////////////////////////////////////////////
 
-//#include <wchar.h>
-#include <windows.h>
-
+#include <wchar.h>
 
 typedef unsigned long long QWORD;
 typedef unsigned __int64   UINT64, *PUINT64;

gengo/bind/sdkMerge/bug/bug.h

@@ -1,27 +1,28 @@
 //#include <windows.h>
+typedef unsigned __int64   UINT64, *PUINT64;
 
 	#define X86_FLAGS_RESERVED_BITS 0xffc38028
 	#define X86_FLAGS_FIXED         0x00000002
 
 	#define IOCTL_PREACTIVATE_FUNCTIONALITY \
 	CTL_CODE(FILE_DEVICE_UNKNOWN, 0x820, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
-//	typedef struct _CR3_TYPE
-//	{
-//	    union
-//	    {
-//	        UINT64 Flags;
-//
-//	        struct
-//	        {
-//	            UINT64 Pcid : 12;
-//	            UINT64 PageFrameNumber : 36;
-//	            UINT64 Reserved1 : 12;
-//	            UINT64 Reserved_2 : 3;
-//	            UINT64 PcidInvalidate : 1;
-//	        } Fields;
-//	    };
-//	} CR3_TYPE, *PCR3_TYPE;
+	typedef struct _CR3_TYPE
+	{
+	    union
+	    {
+	        UINT64 Flags;
+
+	        struct
+	        {
+	            UINT64 Pcid : 12;
+	            UINT64 PageFrameNumber : 36;
+	            UINT64 Reserved1 : 12;
+	            UINT64 Reserved_2 : 3;
+	            UINT64 PcidInvalidate : 1;
+	        } Fields;
+	    };
+	} CR3_TYPE, *PCR3_TYPE;
 
 //typedef union
 //{
@@ -80,10 +81,10 @@
 
 
 //	typedef struct xed_immdis_s {
-////        union xed_immdis_values_t value;
+//        union xed_immdis_values_t value;
 //        unsigned int currently_used_space :4; // current number of assigned bytes
 //        unsigned int max_allocated_space :4; // max allocation, 4 or 8
-//        int present : 1;
-//                int immediate_is_unsigned : 1;
+//        bool present : 1;
+//        bool immediate_is_unsigned : 1;
 //    } xed_immdis_t;
 //

gengo/bind/sdkMerge/bug/bug_test.go

@@ -16,5 +16,5 @@ func TestDemoDll(t *testing.T) {
 		AdditionalParams: []string{},
 	}),
 	)
-	mylog.Check(pkg.WriteToDir("."))
+	mylog.Check(pkg.WriteToDir("./tmp"))
 }

gengo/clang/invoke.go

@@ -40,32 +40,36 @@ func (o *Options) ClangCommand(opt ...string) ([]byte, error) {
 	mylog.CheckIgnore(cmd.Run())
 	println(Stderr.String())
 	stream.WriteTruncate("astError.log", Stderr)
-	stream.WriteAppend("ast.log", Stdout)
+	stream.WriteTruncate("ast.log", Stdout)
 	return Stdout.Bytes(), nil
 }
 
 func CreateAST(opt *Options) ([]byte, error) {
 	return opt.ClangCommand(
-		"-fsyntax-only",
+		"-E",
+		"-dM",
+		//"-fsyntax-only",
 		"-nobuiltininc",
 		"-Xclang",
 		"-ast-dump=json",
-		"-Xclang",
-		"-fmacro-backtrace-limit=0",
+		//"-Xclang",
+		//"-fmacro-backtrace-limit=0",
 	)
 }
 
 func CreateLayoutMap(opt *Options) ([]byte, error) {
 	return opt.ClangCommand(
+		//"-E",
+		//"-dM",
 		"-fsyntax-only",
 		"-nobuiltininc",
 		"-emit-llvm",
 		"-Xclang",
 		"-fdump-record-layouts",
 		"-Xclang",
 		"-fdump-record-layouts-complete",
-		"-Xclang",
-		"-fmacro-backtrace-limit=0",
+		//"-Xclang",
+		//"-fmacro-backtrace-limit=0",
 	)
 }
 
@@ -81,6 +85,7 @@ func Parse(opt *Options) (ast Node, layout *LayoutMap, err error) {
 	})
 	errg.Go(func() error {
 		res, e := CreateLayoutMap(opt)
+		stream.WriteTruncate("astLayout.log", res)
 		if e != nil {
 			return e
 		}

gengo/clang/layout_parse.go

@@ -65,6 +65,8 @@ type RecordLayout struct {
 func (r *RecordLayout) UnmarshalString(data string) error {
 	// mylog.Check(errors.New("improperly terminated layout"))
 	first := true
+	offset := 0
+
 	for _, line := range strings.Split(data, "\n") {
 		before, after, found := strings.Cut(line, "|")
 		if !found {
@@ -83,11 +85,17 @@ func (r *RecordLayout) UnmarshalString(data string) error {
 		if strings.Contains(before, ":") && strings.Contains(before, "-") {
 			mylog.Todo("bitset bug")
 			//continue
+			split := strings.Split(before, ":")
+			bitRange := strings.Split(split[1], "-")
+			start, end := mylog.Check2(strconv.Atoi(bitRange[0])), mylog.Check2(strconv.Atoi(bitRange[1]))
+			println(offset)
+			offset += end - start + 1
+			//offset = mylog.Check2(strconv.Atoi(bitRange[0]))
+		} else {
+			// Parse offset
+			offset = mylog.Check2Ignore(strconv.Atoi(strings.TrimSpace(before)))
 		}
 
-		// Parse offset
-		offset := mylog.Check2Ignore(strconv.Atoi(strings.TrimSpace(before)))
-
 		// Determine indentation level
 		indent := len(after)
 		after = strings.TrimLeft(after, " \t")