Mercurial > projects > ldc
view dmd/mem.c @ 979:523bf4f166bc
Fix some assembler issues:
The assembler was miscompiling "add" (specifically, the "add reg/mem, imm"
variations).
The change that caused this seems to have been made because without it, some
"add"s didn't compile at all.
This patch reverts the previous change, and makes sure assembler operands are
remapped correctly even though the input operands auto-generated due to
updating operations aren't explicitly used.
author | Frits van Bommel <fvbommel wxs.nl> |
---|---|
date | Wed, 18 Feb 2009 21:46:14 +0100 |
parents | 967178e31a13 |
children | b30fe7e1dbb9 |
line wrap: on
line source
/* Copyright (c) 2000 Digital Mars */ /* All Rights Reserved */ #include <cstdio> #include <cstdlib> #include <cstring> #include <cassert> #include "mem.h" #if USE_BOEHM_GC // I needed to perfix the dir after upgrading to gc 7.0 #include "gc/gc.h" #endif /* This implementation of the storage allocator uses the standard C allocation package. */ Mem mem; #if USE_BOEHM_GC static bool gc_was_init = false; void Mem::init() { GC_init(); gc_was_init = true; } char *Mem::strdup(const char *s) { char *p; if (s) { p = GC_strdup(s); if (p) return p; error(); } return NULL; } void *Mem::malloc(size_t size) { void *p; if (!size) p = NULL; else { p = GC_malloc(size); if (!p) error(); } return p; } void *Mem::calloc(size_t size, size_t n) { void *p; if (!size || !n) p = NULL; else { p = GC_malloc(size * n); if (!p) error(); memset(p, 0, size * n); } return p; } void *Mem::realloc(void *p, size_t size) { if (!size) { if (p) { GC_free(p); p = NULL; } } else if (!p) { p = GC_malloc(size); if (!p) error(); } else { p = GC_realloc(p, size); if (!p) error(); } return p; } void Mem::free(void *p) { if (p) GC_free(p); } void *Mem::mallocdup(void *o, size_t size) { void *p; if (!size) p = NULL; else { p = GC_malloc(size); if (!p) error(); else memcpy(p,o,size); } return p; } void Mem::error() { printf("Error: out of memory\n"); exit(EXIT_FAILURE); } void Mem::fullcollect() { GC_gcollect(); } void Mem::mark(void *pointer) { (void) pointer; // necessary for VC /W4 } /* =================================================== */ void * operator new(size_t m_size) { // without this we segfault with gc 7.0 if (!gc_was_init) { mem.init(); } void *p = GC_malloc(m_size); if (p) return p; printf("Error: out of memory\n"); exit(EXIT_FAILURE); return p; } void operator delete(void *p) { GC_free(p); } #elif !USE_BOEHM_GC void Mem::init() { } char *Mem::strdup(const char *s) { char *p; if (s) { p = ::strdup(s); if (p) return p; error(); } return NULL; } void *Mem::malloc(size_t size) { void *p; if (!size) p = NULL; else { p = ::malloc(size); if (!p) error(); } return p; } void *Mem::calloc(size_t size, size_t n) { void *p; if (!size || !n) p = NULL; else { p = ::malloc(size * n); if (!p) error(); memset(p, 0, size * n); } return p; } void *Mem::realloc(void *p, size_t size) { if (!size) { if (p) { ::free(p); p = NULL; } } else if (!p) { p = ::malloc(size); if (!p) error(); } else { p = ::realloc(p, size); if (!p) error(); } return p; } void Mem::free(void *p) { if (p) ::free(p); } void *Mem::mallocdup(void *o, size_t size) { void *p; if (!size) p = NULL; else { p = ::malloc(size); if (!p) error(); else memcpy(p,o,size); } return p; } void Mem::error() { printf("Error: out of memory\n"); exit(EXIT_FAILURE); } void Mem::fullcollect() { } void Mem::mark(void *pointer) { } #endif // USE_BOEHM_GC