1.1 --- a/src/share/vm/utilities/globalDefinitions.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/utilities/globalDefinitions.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -112,6 +112,7 @@
1.11 case T_LONG:
1.12 case T_OBJECT:
1.13 case T_ADDRESS: // random raw pointer
1.14 + case T_METADATA: // metadata pointer
1.15 case T_NARROWOOP: // compressed pointer
1.16 case T_CONFLICT: // might as well support a bottom type
1.17 case T_VOID: // padding or other unaddressed word
1.18 @@ -178,7 +179,7 @@
1.19
1.20
1.21 // Map BasicType to signature character
1.22 -char type2char_tab[T_CONFLICT+1]={ 0, 0, 0, 0, 'Z', 'C', 'F', 'D', 'B', 'S', 'I', 'J', 'L', '[', 'V', 0, 0, 0};
1.23 +char type2char_tab[T_CONFLICT+1]={ 0, 0, 0, 0, 'Z', 'C', 'F', 'D', 'B', 'S', 'I', 'J', 'L', '[', 'V', 0, 0, 0, 0};
1.24
1.25 // Map BasicType to Java type name
1.26 const char* type2name_tab[T_CONFLICT+1] = {
1.27 @@ -196,6 +197,7 @@
1.28 "void",
1.29 "*address*",
1.30 "*narrowoop*",
1.31 + "*metadata*",
1.32 "*conflict*"
1.33 };
1.34
1.35 @@ -231,7 +233,8 @@
1.36 T_VOID, // T_VOID = 14,
1.37 T_ADDRESS, // T_ADDRESS = 15,
1.38 T_NARROWOOP, // T_NARROWOOP= 16,
1.39 - T_CONFLICT // T_CONFLICT = 17,
1.40 + T_METADATA, // T_METADATA = 17,
1.41 + T_CONFLICT // T_CONFLICT = 18,
1.42 };
1.43
1.44
1.45 @@ -253,7 +256,8 @@
1.46 T_VOID, // T_VOID = 14,
1.47 T_ADDRESS, // T_ADDRESS = 15,
1.48 T_NARROWOOP, // T_NARROWOOP = 16,
1.49 - T_CONFLICT // T_CONFLICT = 17,
1.50 + T_METADATA, // T_METADATA = 17,
1.51 + T_CONFLICT // T_CONFLICT = 18,
1.52 };
1.53
1.54
1.55 @@ -275,7 +279,8 @@
1.56 0, // T_VOID = 14,
1.57 T_OBJECT_aelem_bytes, // T_ADDRESS = 15,
1.58 T_NARROWOOP_aelem_bytes,// T_NARROWOOP= 16,
1.59 - 0 // T_CONFLICT = 17,
1.60 + T_OBJECT_aelem_bytes, // T_METADATA = 17,
1.61 + 0 // T_CONFLICT = 18,
1.62 };
1.63
1.64 #ifdef ASSERT
