jdk8-mips64-public/hotspot: comparison src/os/windows/vm/os

-:2fccf735a116
+:95b3ba140211
 /*
-* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2018, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 #endif
 // Windows Vista/2008 heap corruption check
 #define EXCEPTION_HEAP_CORRUPTION        0xC0000374
-#define def_excpt(val) #val, val
-struct siglabel {
-char *name;
-int   number;
-};
 // All Visual C++ exceptions thrown from code generated by the Microsoft Visual
 // C++ compiler contain this error code. Because this is a compiler-generated
 // error, the code is not listed in the Win32 API header files.
 // The code is actually a cryptic mnemonic device, with the initial "E"
 // standing for "exception" and the final 3 bytes (0x6D7363) representing the
 // ASCII values of "msc".
 #define EXCEPTION_UNCAUGHT_CXX_EXCEPTION    0xE06D7363
+#define def_excpt(val) { #val, (val) }
-struct siglabel exceptlabels[] = {
+static const struct { char* name; uint number; } exceptlabels[] = {
 def_excpt(EXCEPTION_ACCESS_VIOLATION),
 def_excpt(EXCEPTION_DATATYPE_MISALIGNMENT),
 def_excpt(EXCEPTION_BREAKPOINT),
 def_excpt(EXCEPTION_SINGLE_STEP),
 def_excpt(EXCEPTION_ARRAY_BOUNDS_EXCEEDED),
 def_excpt(EXCEPTION_STACK_OVERFLOW),
 def_excpt(EXCEPTION_INVALID_DISPOSITION),
 def_excpt(EXCEPTION_GUARD_PAGE),
 def_excpt(EXCEPTION_INVALID_HANDLE),
 def_excpt(EXCEPTION_UNCAUGHT_CXX_EXCEPTION),
-def_excpt(EXCEPTION_HEAP_CORRUPTION),
+def_excpt(EXCEPTION_HEAP_CORRUPTION)
 #ifdef _M_IA64
-def_excpt(EXCEPTION_REG_NAT_CONSUMPTION),
+, def_excpt(EXCEPTION_REG_NAT_CONSUMPTION)
 #endif
-NULL, 0
 };
 const char* os::exception_name(int exception_code, char *buf, size_t size) {
-for (int i = 0; exceptlabels[i].name != NULL; i++) {
+uint code = static_cast<uint>(exception_code);
-if (exceptlabels[i].number == exception_code) {
+for (uint i = 0; i < ARRAY_SIZE(exceptlabels); ++i) {
+if (exceptlabels[i].number == code) {
 jio_snprintf(buf, size, "%s", exceptlabels[i].name);
 return buf;
 }
 }
 // do an allocation at an address selected by the OS to get a good one.
 const size_t large_allocation_size = os::large_page_size() * 4;
 char* result = os::reserve_memory_special(large_allocation_size, os::large_page_size(), NULL, false);
 if (result == NULL) {
 if (VerboseInternalVMTests) {
-gclog_or_tty->print("Failed to allocate control block with size " SIZE_FORMAT ". Skipping remainder of test.",
+gclog_or_tty->print("Failed to allocate control block with size "SIZE_FORMAT". Skipping remainder of test.",
 large_allocation_size);
 }
 } else {
 os::release_memory_special(result, large_allocation_size);
 const size_t expected_allocation_size = os::large_page_size();
 char* expected_location = result + os::large_page_size();
 char* actual_location = os::reserve_memory_special(expected_allocation_size, os::large_page_size(), expected_location, false);
 if (actual_location == NULL) {
 if (VerboseInternalVMTests) {
-gclog_or_tty->print("Failed to allocate any memory at " PTR_FORMAT " size " SIZE_FORMAT ". Skipping remainder of test.",
+gclog_or_tty->print("Failed to allocate any memory at "PTR_FORMAT" size "SIZE_FORMAT". Skipping remainder of test.",
 expected_location, large_allocation_size);
 }
 } else {
 // release memory
 os::release_memory_special(actual_location, expected_allocation_size);
 // only now check, after releasing any memory to avoid any leaks.
 assert(actual_location == expected_location,
-err_msg("Failed to allocate memory at requested location " PTR_FORMAT " of size " SIZE_FORMAT ", is " PTR_FORMAT " instead",
+err_msg("Failed to allocate memory at requested location "PTR_FORMAT" of size "SIZE_FORMAT", is "PTR_FORMAT" instead",
 expected_location, expected_allocation_size, actual_location));
 }
 }
 // restore globals

comparison: src/os/windows/vm/os_windows.cpp

src/os/windows/vm/os_windows.cpp

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/os/windows/vm/os_windows.cpp

src/os/windows/vm/os_windows.cpp