mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-15 13:55:07 +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.
60 lines
1.7 KiB
C
60 lines
1.7 KiB
C
/*
|
|
** Copyright (C) 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.
|
|
**
|
|
*/
|
|
|
|
#ifndef MB_MACHINE_DEF_H
|
|
#define MB_MACHINE_DEF_H
|
|
|
|
#include "mb_stack.h"
|
|
|
|
struct MB_Machine_State_Struct {
|
|
|
|
MB_Bytecode_Addr ip; /* next instruction pointer */
|
|
|
|
/*
|
|
** The stack that the most ancestral bytecode function was using.
|
|
**
|
|
** At entry, each procedure checks to see if initial_stack is
|
|
** NULL. If it is, then it replaces it with the current stack
|
|
** pointer (MB_sp or MB_maxfr depending on code model)
|
|
**
|
|
** At procedure exit (MB_BC_endof_proc), the procedure checks the
|
|
** stack to see whether this invocation was the one that set initfr.
|
|
** If it was the one that set initfr, it knows it should return to
|
|
** native code
|
|
** If it wasn't, then it must have been called by a bytecode proc
|
|
** and returns directly to a bytecode address
|
|
**
|
|
*/
|
|
MB_Word *initial_stack;
|
|
|
|
/*
|
|
** The native code address to return to
|
|
** When a procedure wants to call/return to native code, it sets
|
|
** ip to MB_CODE_NATIVE_RETURN and native_return to the actual
|
|
** native code address to return to
|
|
*/
|
|
MB_Native_Addr native_return;
|
|
|
|
/* The following proc information is all set by MB_proc_type_check() */
|
|
struct {
|
|
/*
|
|
** The determinism of the currently executing procedure
|
|
** (set to a return value from MB_code_get_det)
|
|
*/
|
|
MB_Word is_det;
|
|
|
|
/*
|
|
** Pointer to vars for current procedure
|
|
** Points to variable 0 on either the det or nondet stack
|
|
** (depending on current procedure).
|
|
*/
|
|
MB_Word *var;
|
|
} cur_proc;
|
|
};
|
|
|
|
#endif /* MB_MACHINE_DEF_H */
|