Adjust DDR namespace annotations

* declarations in stackwalk.h grouped to reduce number of annotations required * also in generated constant pool * added VMCPTool option '-verbose' (default off) Issue: eclipse-openj9#378 Signed-off-by: Keith W. Campbell <[email protected]>
yanluo7 · Mar 28, 2018 · 29272a3 · 29272a3
1 parent 76deedc
commit 29272a3
Show file tree

Hide file tree

Showing 6 changed files with 246 additions and 157 deletions.
diff --git a/runtime/compiler/trj9/runtime/MethodMetaData.h b/runtime/compiler/trj9/runtime/MethodMetaData.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corp. and others
+ * Copyright (c) 2000, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -23,6 +23,8 @@
 #ifndef methodmetadata_h
 #define methodmetadata_h
 
+/* @ddr_namespace: map_to_type=J9StackWalkFlags */
+
 #ifdef J9VM_INTERP_STACKWALK_TRACING
 #define jitExceptionHandlerSearch jitExceptionHandlerSearchVerbose
 #define jitWalkStackFrames jitWalkStackFramesVerbose
@@ -204,6 +206,8 @@ typedef struct TR_MapIterator
 #endif /* WINDOWS */
 #endif
 
+/* @ddr_namespace: map_to_type=MethodMetaDataConstants */
+
 #if defined(TR_HOST_POWER)
 #define INTERNAL_PTR_REG_MASK 0x00040000
 #else
@@ -233,7 +237,6 @@ typedef struct TR_MapIterator
 #define ADDRESS_OF_BYTECODEINFO_IN_STACK_MAP(fourByteOffset, stackMap) ((U_8 *)stackMap + SIZEOF_MAP_OFFSET(fourByteOffset))
 #define ADDRESS_OF_LOW_PC_OFFSET_IN_STACK_MAP(fourByteOffset, stackMap) stackMap
 
-
 /* { RTSJ Support begins */
 #define RANGE_NEEDS_FOUR_BYTE_OFFSET(r)   (((r) >= (USHRT_MAX   )) ? 1 : 0)
 #define HAS_FOUR_BYTE_OFFSET(md) (((md)->flags & JIT_METADATA_GC_MAP_32_BIT_OFFSETS) ? 1 : 0)
@@ -418,7 +421,3 @@ J9JITExceptionTable * jitGetMetaDataFromPC(J9VMThread* currentThread, UDATA pc);
 #endif
 
 #endif
-
-
-
-
diff --git a/runtime/gc_base/ScavengerForwardedHeader.hpp b/runtime/gc_base/ScavengerForwardedHeader.hpp
@@ -1,6 +1,5 @@
-
 /*******************************************************************************
- * Copyright (c) 1991, 2017 IBM Corp. and others
+ * Copyright (c) 1991, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -35,6 +34,8 @@
 #include "HeapLinkedFreeHeader.hpp"
 #include "ObjectAccessBarrier.hpp"
 
+/* @ddr_namespace: map_to_type=MM_ScavengerForwardedHeader */
+
 /* used to distinguish a forwarded object from a class pointer */
 #define FORWARDED_TAG ((UDATA)0x4)
 /* the grow tag is used by VLHGC and can only be set if the FORWARDED_TAG is already set.  It signifies that the object grew a hash field when moving */