Mercurial > hg > truffle
diff src/share/vm/utilities/globalDefinitions.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | 8e47bac5643a |
children | cc32ccaaf47f |
line wrap: on
line diff
--- a/src/share/vm/utilities/globalDefinitions.cpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/utilities/globalDefinitions.cpp Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -111,10 +111,12 @@ case T_DOUBLE: case T_LONG: case T_OBJECT: - case T_ADDRESS: // random raw pointer - case T_NARROWOOP: // compressed pointer - case T_CONFLICT: // might as well support a bottom type - case T_VOID: // padding or other unaddressed word + case T_ADDRESS: // random raw pointer + case T_METADATA: // metadata pointer + case T_NARROWOOP: // compressed pointer + case T_NARROWKLASS: // compressed klass pointer + case T_CONFLICT: // might as well support a bottom type + case T_VOID: // padding or other unaddressed word // layout type must map to itself assert(vt == ft, ""); break; @@ -178,7 +180,7 @@ // Map BasicType to signature character -char type2char_tab[T_CONFLICT+1]={ 0, 0, 0, 0, 'Z', 'C', 'F', 'D', 'B', 'S', 'I', 'J', 'L', '[', 'V', 0, 0, 0}; +char type2char_tab[T_CONFLICT+1]={ 0, 0, 0, 0, 'Z', 'C', 'F', 'D', 'B', 'S', 'I', 'J', 'L', '[', 'V', 0, 0, 0, 0, 0}; // Map BasicType to Java type name const char* type2name_tab[T_CONFLICT+1] = { @@ -196,6 +198,8 @@ "void", "*address*", "*narrowoop*", + "*metadata*", + "*narrowklass*", "*conflict*" }; @@ -211,7 +215,7 @@ // Map BasicType to size in words -int type2size[T_CONFLICT+1]={ -1, 0, 0, 0, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 0, 1, 1, -1}; +int type2size[T_CONFLICT+1]={ -1, 0, 0, 0, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 0, 1, 1, 1, 1, -1}; BasicType type2field[T_CONFLICT+1] = { (BasicType)0, // 0, @@ -231,7 +235,9 @@ T_VOID, // T_VOID = 14, T_ADDRESS, // T_ADDRESS = 15, T_NARROWOOP, // T_NARROWOOP= 16, - T_CONFLICT // T_CONFLICT = 17, + T_METADATA, // T_METADATA = 17, + T_NARROWKLASS, // T_NARROWKLASS = 18, + T_CONFLICT // T_CONFLICT = 19, }; @@ -253,29 +259,33 @@ T_VOID, // T_VOID = 14, T_ADDRESS, // T_ADDRESS = 15, T_NARROWOOP, // T_NARROWOOP = 16, - T_CONFLICT // T_CONFLICT = 17, + T_METADATA, // T_METADATA = 17, + T_NARROWKLASS, // T_NARROWKLASS = 18, + T_CONFLICT // T_CONFLICT = 19, }; int _type2aelembytes[T_CONFLICT+1] = { - 0, // 0 - 0, // 1 - 0, // 2 - 0, // 3 - T_BOOLEAN_aelem_bytes, // T_BOOLEAN = 4, - T_CHAR_aelem_bytes, // T_CHAR = 5, - T_FLOAT_aelem_bytes, // T_FLOAT = 6, - T_DOUBLE_aelem_bytes, // T_DOUBLE = 7, - T_BYTE_aelem_bytes, // T_BYTE = 8, - T_SHORT_aelem_bytes, // T_SHORT = 9, - T_INT_aelem_bytes, // T_INT = 10, - T_LONG_aelem_bytes, // T_LONG = 11, - T_OBJECT_aelem_bytes, // T_OBJECT = 12, - T_ARRAY_aelem_bytes, // T_ARRAY = 13, - 0, // T_VOID = 14, - T_OBJECT_aelem_bytes, // T_ADDRESS = 15, - T_NARROWOOP_aelem_bytes,// T_NARROWOOP= 16, - 0 // T_CONFLICT = 17, + 0, // 0 + 0, // 1 + 0, // 2 + 0, // 3 + T_BOOLEAN_aelem_bytes, // T_BOOLEAN = 4, + T_CHAR_aelem_bytes, // T_CHAR = 5, + T_FLOAT_aelem_bytes, // T_FLOAT = 6, + T_DOUBLE_aelem_bytes, // T_DOUBLE = 7, + T_BYTE_aelem_bytes, // T_BYTE = 8, + T_SHORT_aelem_bytes, // T_SHORT = 9, + T_INT_aelem_bytes, // T_INT = 10, + T_LONG_aelem_bytes, // T_LONG = 11, + T_OBJECT_aelem_bytes, // T_OBJECT = 12, + T_ARRAY_aelem_bytes, // T_ARRAY = 13, + 0, // T_VOID = 14, + T_OBJECT_aelem_bytes, // T_ADDRESS = 15, + T_NARROWOOP_aelem_bytes, // T_NARROWOOP= 16, + T_OBJECT_aelem_bytes, // T_METADATA = 17, + T_NARROWKLASS_aelem_bytes, // T_NARROWKLASS= 18, + 0 // T_CONFLICT = 19, }; #ifdef ASSERT