mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-13 21:04:00 +00:00
0921310ca5
With these changes, it now passes all tests/general/* test cases
except those with floats.
Changes to the compiler:
- Added extra argument to test instruction (string comparisons were
being treated as integer comparisons; properly deals with different
atomic type unifications now)
- Changed bytecode stub functions
Changes to the bytecode interpreter:
- Cleaned up comments
- Forked part of mb_machine to mb_exec
- Added support for submodules
- Added support for nondet procedures
- Added support for cc_xxx procedures
- Finished higher order calls
- Added (very basic) debug interface
- Added support for type information
- Added memory corruption checking
- Changed machine state dump formatting
- Fixed bug in nested switches
- Resolved builtin__unify and builtin_compare failures
- Modified bytecode tags generation so .c & .m tag files are separate
- Header usage rationalised
Changes to test suite:
- Added test cases for the bytecode interpreter.
- More work on the bytecode interpreter.
bytecode/Mmakefile:
Modified bytecode tags generation so .c & .m tag files are separate.
mb_machine split into mb_exec.
test file renamed to simple.m (copy over tests/simple??.m to test).
bytecode/TODO:
Updated.
bytecode/mb_basetypes.h:
Removed redundant MB_WORD_BITS (use MR_WORDBITS instead).
bytecode/mb_bytecode.h:
bytecode/mpb_bytecode.c:
Formatting changes
Third test instruction argument added.
bytecode/mb_disasm.h:
bytecode/mb_disasm.c:
Formatting changes.
Third test instruction argument added.
Added MB_FMT_INTWIDE.
bytecode/mb_exec.h:
bytecode/mb_exec.c:
bytecode/mb_machine.h:
bytecode/mb_machine.c:
mb_machine* split into mb_exec* and mb_machine*.
Almost all instructions now work (see important changes above).
bytecode/mb_interface.h:
bytecode/mb_interface.c:
Added nondet stub functions.
Added functions to lookup builtin compiler procedures:
do_redo, do_fail, __unify, __compare.
Removed old debugging code.
Stack layout changed to support nondet procedures.
bytecode/mb_interface_stub.c:
bytecode/mb_interface_stub.h:
Split off bare minimum of includes for bytecode stubs.
Added nondet stubs.
bytecode/mb_machine_show.c:
Made code cleaner (added subfunctions for MB_show_state).
Added variable names to machine state dump.
bytecode/mb_mem.h:
bytecode/mb_mem.c:
Added limited memory corruption checking.
bytecode/mb_module.h:
bytecode/mb_module.c:
Swapped order of temps & vars on stack.
Fixed nested switches causing random crashes.
Added nested module support.
bytecode/test/simple??.m:
Various test files - just to check that it doesn't crash.
(Most do not output anything & must be verified by stepping through
manually).
compiler/bytecode.m:
compiler/bytecode_gen.m:
Added extra argument to test instruction (otherwise
string comparisons would be treated as integer comparisons).
compiler/code_gen.m:
Changed call structure name in bytecode stub to resolve
issues with illegal characters in C structure names.
Changed bytecode stub header file name.
84 lines
2.1 KiB
C
84 lines
2.1 KiB
C
|
|
/*
|
|
** Copyright (C) 1997,2000-2001 The University of Melbourne.
|
|
** This file may only be copied under the terms of the GNU Library General
|
|
** Public License - see the file COPYING.LIB in the Mercury distribution.
|
|
**
|
|
** This file provides basic memory management interfaces
|
|
**
|
|
*/
|
|
|
|
#ifndef MB_MEM_H
|
|
#define MB_MEM_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "mb_basetypes.h"
|
|
|
|
/* Define to convert garbage collection allocations to normal mallocs */
|
|
/* #define MB_NO_GC */
|
|
|
|
/* Define to add memory corruption checking when allocating/deallocating mem */
|
|
#define MB_MALLOC_CHECK
|
|
|
|
/*
|
|
** Do not use MB_malloc() or MB_realloc() directly, unless you want
|
|
** to allocate raw memory. Normally you should use the macros
|
|
** MB_NEW(), MB_NEW_ARRAY(), and MB_RESIZE_ARRAY() instead.
|
|
**
|
|
** None of these are garbage collected and are invisible to the garbage
|
|
** collector
|
|
*/
|
|
|
|
/*
|
|
** These should not be used for small allocations; guard bytes are added
|
|
** for checking. The garbage collected versions are faster for small
|
|
** allocations
|
|
*/
|
|
void* MB_malloc(size_t size);
|
|
|
|
void* MB_realloc(void* mem, size_t size);
|
|
|
|
void MB_free(void *mem);
|
|
|
|
#define MB_NEW(type) ((type *) MB_malloc(sizeof(type)))
|
|
#define MB_NEW_ARRAY(type, num) ((type *) MB_malloc((num) * sizeof(type)))
|
|
#define MB_RESIZE_ARRAY(array, type, num) \
|
|
((type *) MB_realloc((array), (num) * sizeof(type)))
|
|
|
|
/*
|
|
** Garbage collected versions of the above
|
|
** Uses Hans Boehm's conservative garbage collector
|
|
*/
|
|
|
|
/* Atomic == doesn't contain any pointers */
|
|
|
|
void* MB_GC_malloc(size_t size);
|
|
|
|
void* MB_GC_malloc_atomic(size_t size);
|
|
|
|
/* works for both atomic and nonatomic memory */
|
|
void* MB_GC_realloc(void* mem, size_t size);
|
|
|
|
void MB_GC_free(void *mem);
|
|
|
|
#define MB_GC_NEW(type) \
|
|
((type *) MB_GC_malloc(sizeof(type)))
|
|
|
|
#define MB_GC_NEW_ATOMIC(type) \
|
|
((type *) MB_GC_malloc_atomic(sizeof(type)))
|
|
|
|
#define MB_GC_NEW_ARRAY(type, num) \
|
|
((type *) MB_GC_malloc((num) * sizeof(type)))
|
|
|
|
#define MB_GC_NEW_ARRAY_ATOMIC(type, num) \
|
|
((type *) MB_GC_malloc((num) * sizeof(type)))
|
|
|
|
/* works for both atomic and nonatomic memory */
|
|
#define MB_GC_RESIZE_ARRAY(array, type, num) \
|
|
((type *) MB_GC_realloc((array), (num) * sizeof(type)))
|
|
|
|
#endif /* MB_MEM_H */
|
|
|
|
|