Merge pull request #161 from Martmists-GH:main

PiperOrigin-RevId: 829427614
Change-Id: Iaab560399b1ebf81ee0de99e3212d504d1529873

Author: copybara-github

.github/workflows/gradle.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
     inputs:
       ghidra_version:
-        description: 'Specify the Ghidra version(s) you want to build for (e.g. "latest", "11.0")'
+        description: 'Specify the Ghidra version(s) you want to build for (e.g. "latest", "11.4")'
         required: true
         default: '"latest"'
   schedule:
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghidra: ${{ fromJSON(format('[{0}]', inputs.ghidra_version || '"latest","11.4.1","11.4","11.3.2","11.3.1","11.3","11.2.1","11.2","11.1.2","11.1.1","11.1","11.0.3","11.0.2","11.0.1","11.0"')) }}
+        ghidra: ${{ fromJSON(format('[{0}]', inputs.ghidra_version || '"latest","11.4.2","11.4.1","11.4"')) }}
     runs-on: ubuntu-22.04
 
     steps:

java/src/main/java/com/google/security/binexport/BinExport2Builder.java

@@ -37,6 +37,7 @@
 import ghidra.program.model.listing.CodeUnitFormat;
 import ghidra.program.model.listing.CodeUnitFormatOptions;
 import ghidra.program.model.listing.CodeUnitIterator;
+import ghidra.program.model.listing.CommentType;
 import ghidra.program.model.listing.Data;
 import ghidra.program.model.listing.Function;
 import ghidra.program.model.listing.FunctionManager;
@@ -221,11 +222,11 @@ private Optional<Integer> addCommentedExpression(
       commentType = BinExport2.Comment.Type.DEFAULT;
     } else if (markupToken instanceof LabelString) {
       var labelType = ((LabelString) markupToken).getLabelType();
-      if (labelType == LabelString.CODE_LABEL) {
+      if (labelType == LabelString.LabelType.CODE_LABEL) {
         commentType = BinExport2.Comment.Type.GLOBAL_REFERENCE;
-      } else if (labelType == LabelString.VARIABLE) {
+      } else if (labelType == LabelString.LabelType.VARIABLE) {
         commentType = BinExport2.Comment.Type.LOCAL_REFERENCE;
-      } else if (labelType == LabelString.EXTERNAL) {
+      } else if (labelType == LabelString.LabelType.EXTERNAL) {
         commentType = BinExport2.Comment.Type.DEFAULT;
       } else {
         return Optional.empty();
@@ -991,7 +992,7 @@ private void buildComments(Map<Long, Integer> instructionIndices) {
     monitor.setIndeterminate(true);
 
     var comments = new HashSet<String>();
-    for (int commentType : ImmutableList.of(CodeUnit.EOL_COMMENT)) {
+    for (var commentType : ImmutableList.of(CommentType.EOL)) {
       for (CodeUnitIterator codeIt = listing.getCommentCodeUnitIterator(commentType, addrSet);
           codeIt.hasNext() && !monitor.isCancelled(); ) {
         CodeUnit code = codeIt.next();