Merge pull request eclipse-omr#8025 from Deigue/openxl-ddr-encode

Fix encoding of numbers within Type names in DDR

Author: 0xdaryl

ddr/include/ddr/blobgen/java/genBinaryBlob.hpp

@@ -123,13 +123,14 @@ class JavaBlobGenerator : public BlobGenerator
 	};
 
 	BuildBlobInfo _buildInfo;
-	bool _printEmptyTypes;
+	OMRPortLibrary * const _portLibrary;
+	bool const _printEmptyTypes;
 
 	void copyStringTable();
 	DDR_RC stringTableOffset(BlobHeader *blobHeader, J9HashTable *stringTable, const char *cString, uint32_t *offset);
 	DDR_RC countStructsAndStrings(Symbol_IR *ir);
 	DDR_RC addFieldAndConstCount(bool addStructureCount, size_t fieldCount, size_t constCount);
-	DDR_RC buildBlobData(OMRPortLibrary *portLibrary, Symbol_IR *ir);
+	DDR_RC buildBlobData(Symbol_IR *ir);
 	DDR_RC addBlobField(Field *field, uint32_t *fieldCount, size_t baseOffset, const string &prefix);
 	DDR_RC addBlobConst(const string &name, long long value, uint32_t *constCount);
 	DDR_RC addBlobStruct(const string &name, const string &superName, uint32_t constCount, uint32_t fieldCount, uint32_t size);
@@ -139,7 +140,12 @@ class JavaBlobGenerator : public BlobGenerator
 	friend class BlobEnumerateVisitor;
 
 public:
-	explicit JavaBlobGenerator(bool printEmptyTypes) : _printEmptyTypes(printEmptyTypes) {}
+	JavaBlobGenerator(struct OMRPortLibrary *portLibrary, bool printEmptyTypes)
+		: _buildInfo()
+		, _portLibrary(portLibrary)
+		, _printEmptyTypes(printEmptyTypes)
+	{
+	}
 	DDR_RC genBinaryBlob(struct OMRPortLibrary *portLibrary, Symbol_IR *ir, const char *blobFile);
 };
 

ddr/lib/ddr-blobgen/java/genBinaryBlob.cpp

@@ -29,7 +29,6 @@
 #include "ddr/ir/TypeVisitor.hpp"
 #include "ddr/ir/TypedefUDT.hpp"
 #include "ddr/ir/UnionUDT.hpp"
-#include "ddr/std/sstream.hpp"
 
 #undef NDEBUG
 
@@ -48,7 +47,6 @@ using std::string;
 using std::pair;
 using std::make_pair;
 using std::vector;
-using std::stringstream;
 
 #define INVALID_OFFSET (~(uint32_t)0)
 
@@ -281,7 +279,7 @@ JavaBlobGenerator::genBinaryBlob(OMRPortLibrary *portLibrary, Symbol_IR *ir, con
 		/* compute offsets for each entry of string hash table
 		 * compute size of string data - update blob header
 		 */
-		rc = buildBlobData(portLibrary, ir);
+		rc = buildBlobData(ir);
 	}
 
 	intptr_t fd = -1;
@@ -368,13 +366,13 @@ JavaBlobGenerator::countStructsAndStrings(Symbol_IR *ir)
 }
 
 DDR_RC
-JavaBlobGenerator::buildBlobData(OMRPortLibrary *portLibrary, Symbol_IR *ir)
+JavaBlobGenerator::buildBlobData(Symbol_IR *ir)
 {
 	DDR_RC rc = DDR_RC_OK;
 
 	/* allocate hashtable */
 	_buildInfo.stringHash =
-		hashTableNew(portLibrary, OMR_GET_CALLSITE(), 0,
+		hashTableNew(_portLibrary, OMR_GET_CALLSITE(), 0,
 					 sizeof(StringTableEntry), 0, 0, OMRMEM_CATEGORY_UNKNOWN,
 					 stringTableHash, stringTableEquals, NULL, NULL);
 
@@ -782,12 +780,14 @@ JavaBlobGenerator::addBlobStruct(const string &name, const string &superName, ui
 class BlobFieldVisitor : public TypeVisitor
 {
 private:
+	OMRPortLibrary * const _portLibrary;
 	string * const _typePrefix;
 	string * const _typeSuffix;
 
 public:
-	explicit BlobFieldVisitor(string *prefix, string *suffix)
-		: _typePrefix(prefix)
+	BlobFieldVisitor(OMRPortLibrary *portLibrary, string *prefix, string *suffix)
+		: _portLibrary(portLibrary)
+		, _typePrefix(prefix)
 		, _typeSuffix(suffix)
 	{
 	}
@@ -808,11 +808,11 @@ BlobFieldVisitor::visitType(Type *type) const
 	size_t bitWidth = 0;
 
 	if (Type::isStandardType(typeName.c_str(), (size_t)typeName.length(), &isSigned, &bitWidth)) {
-		stringstream newType;
+		OMRPORT_ACCESS_FROM_OMRPORT(_portLibrary);
+		char newType[32];
 
-		newType << (isSigned ? "I" : "U") << bitWidth;
-
-		*_typePrefix += newType.str();
+		omrstr_printf(newType, sizeof(newType), "%c%zu", isSigned ? 'I' : 'U', bitWidth);
+		*_typePrefix += newType;
 	} else {
 		*_typePrefix += typeName;
 	}
@@ -860,11 +860,11 @@ BlobFieldVisitor::visitTypedef(TypedefUDT *type) const
 			size_t bitWidth = 0;
 
 			if (Type::isStandardType(fullName.c_str(), (size_t)fullName.length(), &isSigned, &bitWidth)) {
-				stringstream newType;
-
-				newType << (isSigned ? "I" : "U") << bitWidth;
+				OMRPORT_ACCESS_FROM_OMRPORT(_portLibrary);
+				char newType[32];
 
-				*_typePrefix += newType.str();
+				omrstr_printf(newType, sizeof(newType), "%c%zu", isSigned ? 'I' : 'U', bitWidth);
+				*_typePrefix += newType;
 			} else {
 				*_typePrefix += fullName;
 			}
@@ -917,18 +917,22 @@ JavaBlobGenerator::formatFieldType(Field *field, string *fieldType)
 		} else {
 			typePrefix = field->_modifiers.getModifierNames();
 
-			rc = type->acceptVisitor(BlobFieldVisitor(&typePrefix, &typeSuffix));
+			rc = type->acceptVisitor(BlobFieldVisitor(_portLibrary, &typePrefix, &typeSuffix));
 		}
 	}
 
 	if ((DDR_RC_OK == rc) && (NULL != type)) {
-		stringstream bits;
+		string bitField;
 
 		if (0 != field->_bitField) {
-			bits << ":" << field->_bitField;
+			OMRPORT_ACCESS_FROM_OMRPORT(_portLibrary);
+			char width[32];
+
+			omrstr_printf(width, sizeof(width), ":%zu", field->_bitField);
+			bitField = width;
 		}
 
-		*fieldType = typePrefix + typeSuffix + bits.str();
+		*fieldType = typePrefix + typeSuffix + bitField;
 	}
 
 	return rc;

ddr/lib/ddr-blobgen/java/genBlobJava.cpp

@@ -31,7 +31,7 @@ genBlob(struct OMRPortLibrary *portLibrary, Symbol_IR *ir, const char *supersetF
 	DDR_RC rc = DDR_RC_OK;
 
 	if (NULL != blobFile) {
-		JavaBlobGenerator blobGenerator(printEmptyTypes);
+		JavaBlobGenerator blobGenerator(portLibrary, printEmptyTypes);
 
 		rc = blobGenerator.genBinaryBlob(portLibrary, ir, blobFile);
 

ddr/lib/ddr-blobgen/java/genSuperset.cpp

@@ -27,13 +27,10 @@
 #include "ddr/ir/Symbol_IR.hpp"
 #include "ddr/ir/TypedefUDT.hpp"
 #include "ddr/ir/UnionUDT.hpp"
-#include "ddr/std/sstream.hpp"
 
 #include <assert.h>
 #include <stdio.h>
 
-using std::stringstream;
-
 static string
 replaceAll(string str, const string &subStr, const string &newStr)
 {
@@ -94,11 +91,11 @@ JavaSupersetGenerator::replaceBaseTypedef(Type *type, string *name)
 	 * types such as "U_32" are replaced with "U32".
 	 */
 	if (Type::isStandardType(name->c_str() + start, (size_t)length, &isSigned, &bitWidth)) {
-		stringstream ss;
-
-		ss << (isSigned ? "I" : "U") << bitWidth;
+		OMRPORT_ACCESS_FROM_OMRPORT(_portLibrary);
+		char newType[32];
 
-		name->replace(start, length, ss.str());
+		omrstr_printf(newType, sizeof(newType), "%c%zu", isSigned ? 'I' : 'U', bitWidth);
+		name->replace(start, length, newType);
 	}
 }
 
@@ -259,10 +256,11 @@ JavaSupersetGenerator::getFieldType(Field *field, string *assembledTypeName, str
 	string bitField;
 
 	if ((DDR_RC_OK == rc) && (0 != field->_bitField)) {
-		stringstream ss;
+		OMRPORT_ACCESS_FROM_OMRPORT(_portLibrary);
+		char width[32];
 
-		ss << ":" << field->_bitField;
-		bitField = ss.str();
+		omrstr_printf(width, sizeof(width), ":%zu", field->_bitField);
+		bitField = width;
 	}
 
 	/* Assemble the type name. */