--- parser3/src/main/pa_memory.C	2003/04/01 13:48:32	1.1.2.5.2.9
+++ parser3/src/main/pa_memory.C	2016/09/21 12:03:40	1.13
@@ -1,104 +1,57 @@
 /** @file
 	Parser: memory reference counting classes.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_MEMORY_C="$Date: 2003/04/01 13:48:32 $";
-
 #include "pa_sapi.h"
 #include "pa_common.h"
 
-void *pa_fail_alloc(const char* what, size_t size) {
-#ifdef PA_DEBUG_DISABLE_GC
-	SAPI::abort("xx");
-#else
-	SAPI::abort("out of memory: failed to %s %u bytes. "
-		"heap_used=%lu, heap_free=%lu, bytes_since_gc=%lu, total_bytes=%lu",
-		what, size,
-		GC_get_heap_size(),
-		GC_get_free_bytes(),
-		GC_get_bytes_since_gc(),
-		GC_get_total_bytes()
-		);
-#endif
-	// never reached
-	return 0;
-}
-
+volatile const char * IDENT_PA_MEMORY_C="$Id: pa_memory.C,v 1.13 2016/09/21 12:03:40 moko Exp $" IDENT_PA_MEMORY_H;
 
-#ifdef PA_DEBUG_GC_MEMORY
-
-void bug() {}
-
-const size_t HEADTAIL_SIZE=4;
-
-static size_t debug_size(size_t user_size) {
-	return user_size+HEADTAIL_SIZE*2;
+//{@ Array-oriented
+void *operator new[] (size_t size, bool) { // PointerFreeGC
+	return pa_malloc_atomic(size);
 }
-
-const int BEFORE_MARK=0xBEF0BEF0;
-const int AFTER_MARK=0xAFEEAFEE;
-const char PAD_MARK='\xAD';
-
-static void* fill_return_user(void* aptr, size_t pure_size) {
-	char* ptr=(char*)aptr;
-	memcpy(ptr, &BEFORE_MARK, HEADTAIL_SIZE);
-	memcpy(ptr+pure_size-HEADTAIL_SIZE, &AFTER_MARK, HEADTAIL_SIZE);
-
-	// pAD
-	size_t raw_size=GC_size(aptr);
-	for(size_t i=pure_size; i<raw_size; i++)
-		ptr[i]=PAD_MARK;
-
-	return ptr+HEADTAIL_SIZE;
+void *operator new[] (std::size_t size) PA_THROW(std::bad_alloc) {
+	return pa_malloc(size);
 }
-static void* check_return_debug(void* auser_ptr) {
-	char* user_ptr=(char*)auser_ptr;
-	char* ptr=user_ptr-HEADTAIL_SIZE;
-
-	size_t raw_size=GC_size(ptr);
-	if(raw_size==0)
-		bug();
-
-	size_t pure_size=raw_size;
-	while(ptr[pure_size-1]==PAD_MARK)
-		pure_size--;
-
-	if(memcmp(ptr, &BEFORE_MARK, HEADTAIL_SIZE)!=0)
-		bug();
-	if(memcmp(ptr+pure_size-HEADTAIL_SIZE, &AFTER_MARK, HEADTAIL_SIZE)!=0)
-		bug();
-
-	return ptr;
+void operator delete[] (void *ptr) throw() {
+	pa_free(ptr);
 }
+//}@
 
-
-void* pa_gc_malloc(size_t size) {
-	size=debug_size(size);
-	return fill_return_user(GC_MALLOC(size), size);
+//{@ Structure-oriented
+void *operator new (size_t size, bool) { // PointerFreeGC
+	return pa_malloc_atomic(size);
 }
-
-void* pa_gc_malloc_atomic(size_t size) {
-	size=debug_size(size);
-	return fill_return_user(GC_MALLOC_ATOMIC(size), size);
+void *operator new(std::size_t size) PA_THROW(std::bad_alloc) {
+	return pa_malloc(size);
 }
-
-void* pa_gc_realloc(void* user_ptr, size_t size) {
-	if(!GC_is_visible(user_ptr))
-		bug();
-	//printf("realloc: 0x%p -> %u\n", ptr, size);
-	size=debug_size(size);
-	return fill_return_user(
-		GC_realloc(
-			check_return_debug(user_ptr), 
-			size),
-		size);
-}
-void pa_gc_free(void* ptr) {
-	// ignore free
+void operator delete(void *ptr) throw() {
+	pa_free(ptr);
 }
+//}@
 
 
+void *pa_fail_alloc(const char* what, size_t size) {
+#ifdef PA_DEBUG_DISABLE_GC
+	SAPI::die("out of memory (in pa_fail_alloc)");
+#else
+	SAPI::die("out of memory: failed to %s %u bytes. heap_used=%u, heap_free=%u, bytes_since_gc=%u, total_bytes=%u",
+		what, size, GC_get_heap_size(), GC_get_free_bytes(), GC_get_bytes_since_gc(), GC_get_total_bytes());
+#endif
+	// never reached
+	return 0;
+}
+
+#ifdef _MSC_VER
+extern "C" void *pa_fail_alloc(const char* what);
+void *pa_fail_alloc(const char* what) {
+	SAPI::die("fatal memory error: %s. heap_used=%u, heap_free=%u, bytes_since_gc=%u, total_bytes=%u",
+		what, GC_get_heap_size(), GC_get_free_bytes(), GC_get_bytes_since_gc(), GC_get_total_bytes());
+	// never reached
+	return 0;
+}
 #endif