Mercurial > hg > truffle
diff src/share/vm/runtime/os.hpp @ 4755:2b3acb34791f
Merge
author | dcubed |
---|---|
date | Fri, 06 Jan 2012 16:18:29 -0800 |
parents | 20bfb6d15a94 b16494a69d3d |
children | de268c8a8075 |
line wrap: on
line diff
--- a/src/share/vm/runtime/os.hpp Thu Jan 05 21:02:05 2012 -0800 +++ b/src/share/vm/runtime/os.hpp Fri Jan 06 16:18:29 2012 -0800 @@ -99,9 +99,11 @@ } public: - static void init(void); // Called before command line parsing static jint init_2(void); // Called after command line parsing + static void init_globals(void) { // Called from init_globals() in init.cpp + init_globals_ext(); + } static void init_3(void); // Called at the end of vm init // File names are case-insensitive on windows only @@ -500,6 +502,7 @@ static void print_location(outputStream* st, intptr_t x, bool verbose = false); static size_t lasterror(char *buf, size_t len); + static int get_last_error(); // Determines whether the calling process is being debugged by a user-mode debugger. static bool is_debugger_attached(); @@ -671,6 +674,11 @@ // rest of line is skipped. Returns number of bytes read or -1 on EOF static int get_line_chars(int fd, char *buf, const size_t bsize); + // Extensions +#include "runtime/os_ext.hpp" + + public: + // Platform dependent stuff #ifdef TARGET_OS_FAMILY_linux # include "os_linux.hpp" @@ -715,6 +723,7 @@ # include "os_bsd_zero.hpp" #endif + public: // debugging support (mostly used by debug.cpp but also fatal error handler) static bool find(address pc, outputStream* st = tty); // OS specific function to make sense out of an address