1.1 --- a/src/cpu/x86/vm/assembler_x86.cpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/cpu/x86/vm/assembler_x86.cpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2014, 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 @@ -522,11 +522,11 @@
1.11 // these asserts are somewhat nonsensical
1.12 #ifndef _LP64
1.13 assert(which == imm_operand || which == disp32_operand,
1.14 - err_msg("which %d is_64_bit %d ip " INTPTR_FORMAT, which, is_64bit, ip));
1.15 + err_msg("which %d is_64_bit %d ip " INTPTR_FORMAT, which, is_64bit, p2i(ip)));
1.16 #else
1.17 assert((which == call32_operand || which == imm_operand) && is_64bit ||
1.18 which == narrow_oop_operand && !is_64bit,
1.19 - err_msg("which %d is_64_bit %d ip " INTPTR_FORMAT, which, is_64bit, ip));
1.20 + err_msg("which %d is_64_bit %d ip " INTPTR_FORMAT, which, is_64bit, p2i(ip)));
1.21 #endif // _LP64
1.22 return ip;
1.23
