merged volatile memory barriers

[cacao.git] / src / toolbox / util.c

diff --git a/src/toolbox/util.c b/src/toolbox/util.c
index 82acc8ff7f517543a2999cb0fd9af244295f7f15..fc5a1c4b3696038f631ab257d1740abe72688c1b 100644 (file)
--- a/src/toolbox/util.c
+++ b/src/toolbox/util.c
@@ -1,9 +1,7 @@
 /* src/toolbox/util.c - contains some utility functions
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,12 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
 */
 
 
@@ -40,49 +32,8 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
-#include "vm/vm.h"
-
-
-/* _Jv_getcwd ******************************************************************
-
-   Return the current working directory.
-
-   RETURN VALUE:
-       pointer to a char array allocated by MNEW, or
-          NULL if memory could not be allocated.
-
-*******************************************************************************/
-
-char *_Jv_getcwd(void)
-{
-       char *buf;
-       s4    size;
-
-       size = 1024;
-
-       buf = MNEW(char, size);
-
-       while (buf) {
-               if (getcwd(buf, size) != NULL)
-                       return buf;
-
-               MFREE(buf, char, size);
-
-               /* too small buffer or a more serious problem */
-
-               if (errno != ERANGE)
-                       vm_abort("getcwd failed: %s", strerror(errno));
-
-               /* double the buffer size */
-
-               size *= 2;
-
-               buf = MNEW(char, size);
-       }
-
-       return NULL;
-}
+#include "mm/memory.hpp"
+#include "vm/vm.hpp"
 
 
 /* get_variable_message_length *************************************************