/hg/release/icedtea6-1.7: Fix problems with hs16. is_allocatable...

[enevill at icedtea.classpath.org]

changeset adf8932ab9c3 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=adf8932ab9c3
author: Edward Nevill <ed at camswl.com>
date: Fri Jan 15 17:27:16 2010 +0000

	Fix problems with hs16. is_allocatable not implemented


diffstat:

2 files changed, 22 insertions(+), 1 deletion(-)
ChangeLog                                                |    5 +++
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |   18 +++++++++++++-

diffs (40 lines):

diff -r 856c59d59185 -r adf8932ab9c3 ChangeLog
--- a/ChangeLog	Fri Jan 15 01:29:21 2010 +0100
+++ b/ChangeLog	Fri Jan 15 17:27:16 2010 +0000
@@ -1,3 +1,8 @@ 2010-01-14  Matthias Klose  <doko at ubuntu
+2010-01-15  Edard Nevill <ed at camswl.com>
+
+        * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+	Implement is_allocatable to make build word with hs16
+
 2010-01-14  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am (stamps/icedtea-npplugin): New target, add file
diff -r 856c59d59185 -r adf8932ab9c3 ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Fri Jan 15 01:29:21 2010 +0100
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Fri Jan 15 17:27:16 2010 +0000
@@ -249,7 +249,23 @@ void os::Linux::set_fpu_control_word(int
 }
 
 bool os::is_allocatable(size_t bytes) {
-  ShouldNotCallThis();
+#ifdef AMD64
+  // unused on amd64?
+  return true;
+#else
+
+  if (bytes < 2 * G) {
+    return true;
+  }
+
+  char* addr = reserve_memory(bytes, NULL);
+
+  if (addr != NULL) {
+    release_memory(addr, bytes);
+  }
+
+  return addr != NULL;
+#endif // AMD64
 }
 
 ///////////////////////////////////////////////////////////////////////////////