1.1 --- a/src/share/vm/utilities/globalDefinitions.hpp Mon Jan 11 13:41:45 2016 -0800
1.2 +++ b/src/share/vm/utilities/globalDefinitions.hpp Fri Jan 15 22:33:15 2016 +0000
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2016, 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 @@ -796,14 +796,15 @@
1.11
1.12 enum TosState { // describes the tos cache contents
1.13 btos = 0, // byte, bool tos cached
1.14 - ctos = 1, // char tos cached
1.15 - stos = 2, // short tos cached
1.16 - itos = 3, // int tos cached
1.17 - ltos = 4, // long tos cached
1.18 - ftos = 5, // float tos cached
1.19 - dtos = 6, // double tos cached
1.20 - atos = 7, // object cached
1.21 - vtos = 8, // tos not cached
1.22 + ztos = 1, // byte, bool tos cached
1.23 + ctos = 2, // char tos cached
1.24 + stos = 3, // short tos cached
1.25 + itos = 4, // int tos cached
1.26 + ltos = 5, // long tos cached
1.27 + ftos = 6, // float tos cached
1.28 + dtos = 7, // double tos cached
1.29 + atos = 8, // object cached
1.30 + vtos = 9, // tos not cached
1.31 number_of_states,
1.32 ilgl // illegal state: should not occur
1.33 };
1.34 @@ -812,7 +813,7 @@
1.35 inline TosState as_TosState(BasicType type) {
1.36 switch (type) {
1.37 case T_BYTE : return btos;
1.38 - case T_BOOLEAN: return btos; // FIXME: Add ztos
1.39 + case T_BOOLEAN: return ztos;
1.40 case T_CHAR : return ctos;
1.41 case T_SHORT : return stos;
1.42 case T_INT : return itos;
1.43 @@ -828,8 +829,8 @@
1.44
1.45 inline BasicType as_BasicType(TosState state) {
1.46 switch (state) {
1.47 - //case ztos: return T_BOOLEAN;//FIXME
1.48 case btos : return T_BYTE;
1.49 + case ztos : return T_BOOLEAN;
1.50 case ctos : return T_CHAR;
1.51 case stos : return T_SHORT;
1.52 case itos : return T_INT;
