Annotations for Constant Variables and Global Variables for the decom…

…piler (#17281)

.appveyor.yml

@@ -8,6 +8,7 @@ skip_tags: true
 branches:
   only:
     - master
+    - decompiler-refactoring
 
 # Environment variables
 environment:

.github/workflows/centos6.yml

@@ -7,6 +7,7 @@ on:
     - 'prerelease*'
     - 'release-*'
     - 'centos*'
+    - 'decompiler-refactoring'
   schedule:
     - cron: '0 18 * * 1,3,5' # Three-weekly at 18:00 UTC on Monday, Wednesday, and Friday
 

.github/workflows/ci.yaml

@@ -7,6 +7,7 @@ on:
     - 'pre-release*'
     - 'prerelease*'
     - 'release*'
+    - 'decompiler-refactoring'
 
 jobs:
   build:

.github/workflows/newshell-treesitter-tests.yml

@@ -10,6 +10,7 @@ on:
       - 'shlr/radare2-shell-parser/**/*'
     branches:
       - master
+      - decompiler-refactoring
 
 jobs:
   build:

.github/workflows/pr.yaml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
     - master
+    - decompiler-refactoring
 
 jobs:
   build:

.github/workflows/static.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
     - master
+    - decompiler-refactoring
 
 jobs:
   build:

.travis.yml

@@ -12,6 +12,7 @@ branches:
   - master
   - /^release-.*$/
   - /^prerelease-.*$/
+  - decompiler-refactoring
 
 services:
   - docker

libr/core/cannotated_code.c

@@ -30,8 +30,16 @@ R_API void r_core_annotated_code_print_json(RAnnotatedCode *code) {
 			break;
 		case R_CODE_ANNOTATION_TYPE_FUNCTION_NAME:
 			pj_ks (pj, "type", "function_name");
-			pj_ks (pj, "name", annotation->function_name.name);
-			pj_kn (pj, "function_offset", annotation->function_name.offset);
+			pj_ks (pj, "name", annotation->reference.name);
+			pj_kn (pj, "offset", annotation->reference.offset);
+			break;
+		case R_CODE_ANNOTATION_TYPE_GLOBAL_VARIABLE:
+			pj_ks (pj, "type", "global_variable");
+			pj_kn (pj, "offset", annotation->reference.offset);
+			break;
+		case R_CODE_ANNOTATION_TYPE_CONSTANT_VARIABLE:
+			pj_ks (pj, "type", "constant_variable");
+			pj_kn (pj, "offset", annotation->reference.offset);
 			break;
 		case R_CODE_ANNOTATION_TYPE_SYNTAX_HIGHLIGHT:
 			pj_ks (pj, "type", "syntax_highlight");

libr/include/r_util/r_annotated_code.h

@@ -35,7 +35,9 @@ typedef enum r_syntax_highlight_type_t {
 typedef enum r_code_annotation_type_t {
 	R_CODE_ANNOTATION_TYPE_OFFSET,
 	R_CODE_ANNOTATION_TYPE_SYNTAX_HIGHLIGHT,
-	R_CODE_ANNOTATION_TYPE_FUNCTION_NAME
+	R_CODE_ANNOTATION_TYPE_FUNCTION_NAME,
+	R_CODE_ANNOTATION_TYPE_GLOBAL_VARIABLE,
+	R_CODE_ANNOTATION_TYPE_CONSTANT_VARIABLE
 	// ...
 } RCodeAnnotationType;
 
@@ -52,10 +54,14 @@ typedef struct r_code_annotation_t {
 			RSyntaxHighlightType type;
 		} syntax_highlight;
 
+		/** Information in annotations of type R_CODE_ANNOTATION_TYPE_FUNCTION_NAME,
+		 * R_CODE_ANNOTATION_TYPE_GLOBAL_VARIABLE, and R_CODE_ANNOTATION_TYPE_CONSTANT_VARIABLE
+		 * will be stored in the struct name reference in this union.
+		 */
 		struct {
 			char *name;
-			ut64 offset; // offset of the function with the name specified
-		} function_name;
+			ut64 offset; // address
+		} reference;
 	};
 } RCodeAnnotation;
 

libr/util/annotated_code.c

@@ -17,7 +17,7 @@ R_API void r_annotation_free(void *e, void *user) {
 	(void)user;
 	RCodeAnnotation *annotation = e;
 	if (annotation->type == R_CODE_ANNOTATION_TYPE_FUNCTION_NAME) {
-		free (annotation->function_name.name);
+		free (annotation->reference.name);
 	}
 }