Preparations for use of ddrgen

In support of openj9#378

* correct references to getmacros script
* add missing ddr_namespace annotations
* use J9HASH_TABLE_AVL_TREE_TAG_BIT instead of hard-coded constant
* ignore objs directory

Signed-off-by: Keith W. Campbell <[email protected]>

Author: keithc-ca

.gitignore

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2014, 2017 IBM Corp. and others
+# Copyright (c) 2014, 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
@@ -21,6 +21,7 @@
 ###############################################################################
 
 build/
+objs/
 CMakeFiles/
 CMakeCache.txt
 omrcfg.h

compiler/env/defines.h

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 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
@@ -37,7 +37,6 @@
    pre-processor macros, it shouldn't contain anything else.
 */
 
-
 /* Operating Systems */
 #ifndef OMR_LINUX
 #  define OMR_LINUX   201
@@ -83,6 +82,8 @@
 #  define COMPILER_CLANG 304
 #endif
 
+/* @ddr_namespace: map_to_type=TRBuildFlags */
+
 /*
   Standardize the OS macros Use HOST_OS instead of various different
   ways of checking for a particular host os.  As a reference, see
@@ -169,6 +170,8 @@
 #  define TR_HOST_ARM    1
 #endif
 
+/* @ddr_namespace: default */
+
 /* FIXME: we need to document what these ifdefs do
    If these are permanently enabled, the ifdefs should be removed
    and the guarded code permanently enabled */

ddr_artifacts.mk

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2016, 2017 IBM Corp. and others
+# Copyright (c) 2016, 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
@@ -30,10 +30,10 @@ top_srcdir = .
 include $(top_srcdir)/omrmakefiles/configure.mk
 
 # Ensure the source tree path is canonically-formed and ends with /
-abs_srcroot = $(abspath $(TOP_SRCDIR))/
+abs_srcroot := $(subst //,/,$(abspath $(TOP_SRCDIR))/)
 
 all: check-vars
-	./tools/ddrgen/src/macros/getMacros.sh $(abs_srcroot)
+	bash $(top_srcdir)/ddr/tools/getmacros $(abs_srcroot)
 	$(exe_output_dir)/ddrgen --filelist $(DBG_FILE_LIST) --macrolist $(abs_srcroot)macroList 
 
 check-vars:

fvtest/omrtest.mk

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2015, 2016 IBM Corp. and others
+# Copyright (c) 2015, 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
@@ -45,8 +45,8 @@ omr_algotest:
 	./omralgotest -avltest:fvtest/algotest/avltest.lst
 
 omr_ddrtest:
-	tools/ddrgen/src/macros/getMacros.sh "tools/ddrgen/test"
-	./ddrgen ./ddrgentest --macrolist test/macroList
+	bash $(top_srcdir)/ddr/tools/getmacros tools/ddrgen/test
+	./ddrgen ddrgentest --macrolist test/macroList
 
 omr_gctest:
 	./omrgctest --gtest_filter="gcFunctionalTest*"

gc/base/segregated/RegionPoolSegregated.hpp

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1991, 2015 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
@@ -43,6 +43,8 @@ class MM_LockingHeapRegionQueue;
 #define PRIMARY_BUCKET 0
 #define SKIP_AVAILABLE_REGION_FOR_ALLOCATION 1
 
+/* @ddr_namespace: map_to_type=MM_RegionPoolSegregated */
+
 /*
  * Thresholds for dividing available list into buckets so that we tend to
  * defrag low occupancy regions and allocate into high occupancy ones.

include_core/omrcfg.h.in

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2017 IBM Corp. and others
+ * Copyright (c) 2015, 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
@@ -29,6 +29,8 @@
 #if !defined(OMRCFG_H_)
 #define OMRCFG_H_
 
+/* @ddr_namespace: map_to_type=OmrBuildFlags */
+
 #undef OMR_GC
 #undef OMR_JIT
 #undef OMR_JITBUILDER
@@ -58,7 +60,6 @@
 #undef OMR_GC_SEGREGATED_HEAP
 #undef OMR_GC_THREAD_LOCAL_HEAP
 
-
 /**
  * Tells if a platform has support for Semaphores.
  * ifRemoved: platform cannot use semaphore operations.

include_core/omrhashtable.h

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1991, 2016 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
@@ -31,16 +31,18 @@
 extern "C" {
 #endif
 
-
 /* DO NOT DIRECTLY INCLUDE THIS FILE! */
 /* Include hashtable_api.h instead */
 
-
 #include "omravl.h"
 #include "omrcomp.h"
 #include "omrport.h"
 #include "pool_api.h"
 
+/*
+ * @ddr_namespace: map_to_type=J9HashtableConstants
+ */
+
 /**
  * Hash table flags
  */
@@ -50,7 +52,11 @@ extern "C" {
 #define J9HASH_TABLE_ALLOW_SIZE_OPTIMIZATION	0x00000008	/*!< Allow space optimized hashTable, some functions not supported */
 #define J9HASH_TABLE_DO_NOT_REHASH	0x00000010	/*!< Do not rehash the table while set */
 
-#define J9HASH_TABLE_AVL_TREE_TAG_BIT ((uintptr_t)0x00000001) /*!< Bit to indicate that hastable slot contains a pointer to an AVL tree */
+/*
+ * This used to include a cast to uintptr_t, but ddrgen doesn't
+ * handle casts; that cast has been moved to hashtable.c.
+ */
+#define J9HASH_TABLE_AVL_TREE_TAG_BIT 0x00000001 /*!< Bit to indicate that hastable slot contains a pointer to an AVL tree */
 
 /**
  * Hash Table state constants for iteration
@@ -59,6 +65,10 @@ extern "C" {
 #define J9HASH_TABLE_ITERATE_STATE_TREE_NODES 1
 #define J9HASH_TABLE_ITERATE_STATE_FINISHED  2
 
+/*
+ * @ddr_namespace: default
+ */
+
 /**
  * Macros for getting at data directly from AVLTreeNodes
  */

omrcfg.CMakeTemplate.h

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2017 IBM Corp. and others
+ * Copyright (c) 2017, 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
@@ -28,6 +28,8 @@
 #if !defined(OMRCFG_H_)
 #define OMRCFG_H_
 
+/* @ddr_namespace: map_to_type=OmrBuildFlags */
+
 #cmakedefine OMR_GC
 #cmakedefine OMR_JIT
 #cmakedefine OMR_JITBUILDER

util/hashtable/hashtable.c

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1991, 2015 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
@@ -62,7 +62,7 @@
  */
 #define NEXT(p) *((void **)((uint8_t *)p + table->listNodeSize - sizeof(uintptr_t)))
 
-#define AVL_TREE_TAG_BIT ((uintptr_t)0x00000001)
+#define AVL_TREE_TAG_BIT ((uintptr_t)J9HASH_TABLE_AVL_TREE_TAG_BIT)
 #define AVL_TREE_TAGGED(p) (((uintptr_t)(p)) & AVL_TREE_TAG_BIT)
 #define AVL_TREE_TAG(p) ((J9AVLTree *)(((uintptr_t)(p)) | AVL_TREE_TAG_BIT))
 #define AVL_TREE_UNTAG(p) ((J9AVLTree *)(((uintptr_t)(p)) & (~AVL_TREE_TAG_BIT)))