Cleanup dead code

CMakeLists.txt

@@ -214,7 +214,7 @@ elseif(WIN)
     SET(CMAKE_SYSTEM_NAME Windows)
 
     add_compile_definitions(WIN32_LEAN_AND_MEAN)
-    add_compile_definitions(NO_ISNAN NO_SERVICE LSB_FIRST=1 AllocationCheckFiller=0xADD4E55)
+    add_compile_definitions(NO_ISNAN LSB_FIRST=1 AllocationCheckFiller=0xADD4E55)
 
     #Setting minimal Windows Version to VISTA
     add_compile_definitions(_WIN32_WINNT=0x0600 WINVER=0x0600 NTDDI_VERSION=0x06000000 WIN64=1)
@@ -298,7 +298,6 @@ add_compile_options(
 add_compile_definitions(
     IMMUTABILITY=1
     COGMTVM=0
-    PharoVM=1
     DEBUGVM=${DEBUGVM}
     _FILE_OFFSET_BITS=64
 )
@@ -347,14 +346,6 @@ message(STATUS "long ${SIZEOF_LONG}")
 message(STATUS "long long ${SIZEOF_LONG_LONG}")
 message(STATUS "void* ${SIZEOF_VOID_P}")
 
-if("${SIZEOF_LONG}" STREQUAL "8")
-	set(SQUEAK_INT64_TYPEDEF "long")
-elseif("${SIZEOF_LONG_LONG}" STREQUAL "8")
-	set(SQUEAK_INT64_TYPEDEF "long long")
-else()
-	message(FATAL_ERROR "Failed to find a 64 bits integer type.")
-endif()
-
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/build/vm/")
 
 #If in OSX, configure creation of Bundle

include/pharovm/common/sqaio.h → include/pharovm/common/aio.h

@@ -1,11 +1,11 @@
-/* sqaio.h -- asynchronous file i/o
+/* aio.h -- asynchronous file i/o
  *
  *   Copyright (C) 1996-2004 by Ian Piumarta and other authors/contributors
  *                              listed elsewhere in this file.
  *   All rights reserved.
  *   
  *   This file is part of Unix Squeak.
- * 
+ *
  *   Permission is hereby granted, free of charge, to any person obtaining a
  *   copy of this software and associated documentation files (the "Software"),
  *   to deal in the Software without restriction, including without limitation
@@ -28,8 +28,7 @@
 /* author: [email protected]
  */
 
-#ifndef __sqaio_h
-#define __sqaio_h
+#pragma once
 
 #define AIO_X	(1<<0)	/* handle for exceptions */
 #define AIO_R	(1<<1)	/* handle for read */
@@ -86,44 +85,3 @@ EXPORT(void) aioDisable(int fd);
  * handler(s) being called before returning.
  */
 EXPORT(long) aioPoll(long microSeconds);
-
-extern unsigned volatile long long ioUTCMicroseconds(void);
-extern unsigned volatile long long ioUTCMicrosecondsNow(void);
-
-/*
- * I interrupt the poll when there is an event that the VM should handle.
- * For example, when signalling a Pharo semaphore
- */
-EXPORT(void) aioInterruptPoll();
-
-/**
- * I block the caller if we are in the aioPoll
- */
-EXPORT(void) aioWaitIfInPoll();
-
-/* debugging stuff. */
-#ifdef AIO_DEBUG
-# ifdef ACORN
-#   define FPRINTF(s) \
-    do { \
-      extern os_error privateErr; \
-      extern void platReportError(os_error *e); \
-      privateErr.errnum = (bits)0; \
-      sprintf s; \
-      platReportError((os_error *)&privateErr); \
-    } while (0)
-# else /* !ACORN */
-    extern long aioLastTick, aioThisTick, ioMSecs(void);
-	extern const char *__shortFileName(const char *);
-#   define FPRINTF(X) do { \
-	aioThisTick = ioMSecs(); \
-	fprintf(stderr, "%8ld %4ld %s:%d ", aioThisTick, aioThisTick - aioLastTick,\
-			__shortFileName(__FILE__),__LINE__); \
-	aioLastTick = aioThisTick; \
-	fprintf X; } while (0)
-# endif /* ACORN */
-#else /* !DEBUG */
-# define FPRINTF(X)
-#endif
-
-#endif /* __sqaio_h */

include/pharovm/common/sqAssert.h → include/pharovm/common/assert.h

@@ -12,18 +12,13 @@
  *
  * assertl, assertal & assertfl take a line number as an argument.
  */
+#pragma once
 
 #include "pharovm/debug.h"
-/* Include assert to ensure our macros do not get redefined by the standard ones.*/
-#include <assert.h>
-
-#undef assert
-#undef asserta
-#undef assertf
-#undef assertl
-#undef assertal
-#undef assertfl
-#undef eassert
+
+#ifdef assert
+#	error "Do not include system asserts"
+#endif
 
 #ifdef NDEBUG /* compatible with Mac OS X (FreeBSD) /usr/include/assert.h */
 # define assert(expr) (void) 0 /* hack disabling of asserts.  Better in makefile? */

include/pharovm/common/sqAtomicOps.h → include/pharovm/common/atomic.h

@@ -6,7 +6,7 @@
 *			 Atomic 32-bit increment (e.g. for signalSemaphoreWithIndex:).
 *				sqAtomicAddConst(var,n)
 *				sqCompareAndSwap(var,old,new)
-*   FILE:    sqAtomicOps.h
+*   FILE:    atomic.h
 *
 *   AUTHOR:  Eliot Miranda
 *   EMAIL:   [email protected]
@@ -139,7 +139,7 @@ AtomicGet(uint64_t *target)
  * can only depend on global variables being correctly aligned on systems
  * such as Mac OS X, which aligns the stack on a 128-bit boundary.
  */
-#	include "sqAssert.h"
+#	include "assert.h"
 
 #	define lo32(x) (*(((unsigned long *)&(x))+0))
 #	define hi32(x) (*(((unsigned long *)&(x))+1))
@@ -223,7 +223,7 @@ AtomicGet(unsigned long long *target)
 # endif
 
 #else /* neither IS_64_BIT_ARCH nor IS_32_BIT_ARCH */
-# error Could not infer if architecture is 32 or 64 bits. Please modify sqAtomicOps.h inference rules.
+# error Could not infer if architecture is 32 or 64 bits. Please modify atomic.h inference rules.
 #endif
 
 #if defined(__GNUC__)