aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-04-02 09:23:18 +0000
committerMax Horn2006-04-02 09:23:18 +0000
commita30d832ee08575bc02ab53c9daeccba830dec5a9 (patch)
tree676376bac3bba058227da65aa56599b4a23f887a
parent041bc770e82bf67c2e1535c165d42926375f866a (diff)
downloadscummvm-rg350-a30d832ee08575bc02ab53c9daeccba830dec5a9.tar.gz
scummvm-rg350-a30d832ee08575bc02ab53c9daeccba830dec5a9.tar.bz2
scummvm-rg350-a30d832ee08575bc02ab53c9daeccba830dec5a9.zip
Removed built-in endian/alignment verifier (it's original purpose is mostly gone now that we have a configure script detecting endianess and more)
svn-id: r21549
-rw-r--r--base/main.cpp47
1 files changed, 0 insertions, 47 deletions
diff --git a/base/main.cpp b/base/main.cpp
index ee9258c887..9fc06c75d3 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -148,48 +148,6 @@ const char *gScummVMFeatures = ""
const char* stackCookie = "$STACK: 655360\0";
#endif
-#if defined(UNIX)
-#include <signal.h>
-
-#ifndef SCUMM_NEED_ALIGNMENT
-static void handle_errors(int sig_num) {
- error("Your system does not support unaligned memory accesses. Please rebuild with SCUMM_NEED_ALIGNMENT (signal %d)", sig_num);
-}
-#endif
-
-/* This function is here to test if the endianness / alignement compiled it is matching
- with the one at run-time. */
-static void do_memory_test(void) {
- unsigned char test[8] = { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88 };
- unsigned int value;
- /* First test endianness */
-#ifdef SCUMM_LITTLE_ENDIAN
- if (*((int *) test) != 0x44332211) {
- error("Compiled as LITTLE_ENDIAN on a big endian system. Please rebuild ");
- }
- value = 0x55443322;
-#else
- if (*((int *) test) != 0x11223344) {
- error("Compiled as BIG_ENDIAN on a little endian system. Please rebuild ");
- }
- value = 0x22334455;
-#endif
- /* Then check if one really supports unaligned memory accesses */
-#ifndef SCUMM_NEED_ALIGNMENT
- signal(SIGBUS, handle_errors);
- signal(SIGABRT, handle_errors);
- signal(SIGSEGV, handle_errors);
- if (*((unsigned int *) ((char *) test + 1)) != value) {
- error("Your system does not support unaligned memory accesses. Please rebuild with SCUMM_NEED_ALIGNMENT ");
- }
- signal(SIGBUS, SIG_DFL);
- signal(SIGABRT, SIG_DFL);
- signal(SIGSEGV, SIG_DFL);
-#endif
-}
-
-#endif
-
/**
* The debug level. Initially set to -1, indicating that no debug output
* should be shown. Positive values usually imply an increasing number of
@@ -331,11 +289,6 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
char *s=NULL;//argv[1]; SumthinWicked says: cannot assume that argv!=NULL here! eg. Symbian's CEBasicAppUI::SDLStartL() calls as main(0,NULL), if you want to change plz #ifdef __SYMBIAN32__
bool running = true;
-#if defined(UNIX)
- /* On Unix, do a quick endian / alignement check before starting */
- do_memory_test();
-#endif
-
// Quick preparse of command-line, looking for alt configfile path
for (int i = argc - 1; i >= 1; i--) {
s = argv[i];