Changeset 106725 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 27, 2024 9:02:31 PM (4 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165608

Message:

VMM/IEM: Produce IEMAssemblyOffsets.h on win.arm64 using llvm-pdbutil/pretty and a sed script. jiraref:VBP-1253

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (2 diffs)
• pdbutil-to-offsets.sed (copied) (copied from trunk/src/VBox/VMM/dwarfdump-to-offsets.sed ) (2 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -693 +693 @@
         $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMAssemblyOffsets.h
   $(call KB_FN_AUTO_CMD_DEPS,$(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMAssemblyOffsets.h.ts)
-  $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMAssemblyOffsets.h.ts \
-  +| $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMAssemblyOffsets.h: \
-                $(VBoxVMM_0_OUTDIR)/VMMAll/IEMAllN8veRecompiler.o \
-                $(PATH_SUB_CURRENT)/dwarfdump-to-offsets.sed
+  ifeq ($(KBUILD_TARGET),win)
+   $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMAssemblyOffsets.h.ts \
+   +| $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMAssemblyOffsets.h: \
+                $(VBoxVMM_0_OUTDIR)/VMMAll/IEMAllN8veRecompiler-obj.pdb \
+                $(PATH_SUB_CURRENT)/pdbutil-to-offsets.sed
+        $(QUIET)$(call MSG_GENERATE,VBoxVMM,$@,IEMAllN8veRecompiler-obj.pdb)
+        $(QUIET)$(RM) -f -- "$@" "[email protected]"
+        $(QUIET)$(MKDIR) -p -- "$(dir $@)"
+        $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
+        $(QUIET)$(REDIRECT) -0 /dev/null -o "[email protected]" -- \
+                $(TOOL_VCC143-CLANGXX_PREFIX2)pdbutil$(TOOL_VCC143-CLANGXX_SUFFIX2) \
+                        pretty --with-name=VMCPU --with-name=IEMCPU "$<"
+        $(QUIET)$(SED) -n -f "$(filter %.sed,$^)" --output "$@" "[email protected]"
+        $(QUIET)$(RM) -f "[email protected]"
+        $(QUIET)$(CP) -v -f --changed -- "$@" "$(basename $@)"
+  else
+   $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMAssemblyOffsets.h.ts \
+   +| $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMAssemblyOffsets.h: \
+                $(VBoxVMM_0_OUTDIR)/VMMAll/IEMAllN8veRecompiler.o \
+                $(PATH_SUB_CURRENT)/dwarfdump-to-offsets.sed
         $(QUIET)$(call MSG_GENERATE,VBoxVMM,$@,IEMAllN8veRecompiler.o)
         $(QUIET)$(RM) -f -- "$@" "[email protected]"
@@ -706 +722 @@
         $(QUIET)$(RM) -f "[email protected]"
         $(QUIET)$(CP) -v -f --changed -- "$@" "$(basename $@)"
+  endif
 
   # Set up the dependencies.
-  $(VBoxVMM_0_OUTDIR)/VMMAll/IEMAllN8veHlpA-arm64.o: $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMAssemblyOffsets.h
+  $(VBoxVMM_0_OUTDIR)/VMMAll/IEMAllN8veHlpA-arm64.o:   $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMAssemblyOffsets.h
+  $(VBoxVMM_0_OUTDIR)/VMMAll/IEMAllN8veHlpA-arm64.obj: $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMAssemblyOffsets.h
  endif
 

trunk/src/VBox/VMM/pdbutil-to-offsets.sed

@@ -3 +3 @@
 # For defining member offsets for selected struct so the ARM64 assembler can use them.
 #
-# The script ASSUMES that the input is well filtered and the the output doesn't
-# change in any way that makes it difficult to match and edit.  The dwarfdump
-# utility assumed there, is the one from llvm that shippes with apple's command
-# line tools.
-#
-# These assumptions aren't ideal, however the two alternatives are:
-#   1. Build time program to print the offsets via RT_UOFFSETOF,
-#   2. Build time program parsing the dwarf info ourselves.
-#
-# The problem with the first option is that we have to get all the DEFS right
-# as well as the compiler options to ensure that we end up with the same
-# structure layout.  Doesn't led itself for cross building either (not all that
-# relevant for darwin, but it probably is for linux).
-#
-# The second option is potentially a lot of work as we don't have any IPRT
-# interface for browsing types found in debug info yet.  Once that is added, it
-# shouldn't be all that difficult.
+# This script uses the 'pretty' command in the llvm-pdbutil.exe utility to do 
+# the dumping from IEMAllN8veRecompiler-obj.pdb.  The script ASSUMES a specific
+# output format and indentation system to work.
 #
 
@@ -45 +31 @@
 
 #
-# This matches first level structure types, putting the name in the hold space for later use.
+# The top-level VMCPU members.
 #
-# ASSUMES that the DW_AT_xxx listing follow on separate lines, one line per attribute
-# ASSUMES that there is a blank line after the DW_AT_xxx listing
-# ASSUMES that first level structures have exactly one space after the colon.
-#
-/^0x[[:xdigit:]][[:xdigit:]]*: DW_TAG_structure_type/,/^[[:space:]]*$/ {
-    /DW_AT_name/ {
-        s/^.*DW_AT_name[[:space:]]*[(]["]//
-        s/["][)][[:space:]]*$//
-        h
-    }
-    /DW_AT_data_member_location/p
+/^  struct VMCPU .* {$/,/^  }$/ {
+    s/^    data [+]\(0x[[:xdigit:]][[:xdigit:]]*\) .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\#define VMCPU_OFF_\2 \1/p
+    s/^    data [+]\(0x[[:xdigit:]][[:xdigit:]]*\) .* \([a-zA-Z_][a-zA-Z0-9_]*\)\[[0-9][0-9]*]$/\#define VMCPU_OFF_\2 \1/p
 }
 
-
-
 #
-# This matches the first level of structure members.
+# The top-level IEMCPU members.
 #
-# ASSUMES that the DW_AT_xxx listing follow on separate lines, one line per attribute
-# ASSUMES that there is a blank line after the DW_AT_xxx listing
-# ASSUMES that first level member have exactly three spaces after the colon.
-#
-/^0x[[:xdigit:]][[:xdigit:]]*:   DW_TAG_member/,/^[[:space:]]*$/ {
-    /DW_AT_name/ {
-        s/^.*DW_AT_name[[:space:]]*[(]["]/_OFF_/
-        s/["][)][[:space:]]*$//
-        x
-        H
-        x
-        s/\(_OFF_.*\)[\n]\(.*\)$/#define \2\1 \\/
-        p
-    }
-    /DW_AT_data_member_location/ {
-        s/^[[:space:]]*DW_AT_data_member_location[[:space:]]*/                /
-        p
-    }
+/^  struct IEMCPU .* {$/,/^  }$/ {
+    s/^    data [+]\(0x[[:xdigit:]][[:xdigit:]]*\) .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\#define IEMCPU_OFF_\2 \1/p
+    s/^    data [+]\(0x[[:xdigit:]][[:xdigit:]]*\) .* \([a-zA-Z_][a-zA-Z0-9_]*\)\[[0-9][0-9]*]$/\#define IEMCPU_OFF_\2 \1/p
 }