projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Merged executionstate branch.
[cacao.git]
/
src
/
vm
/
jit
/
i386
/
linux
/
md-os.c
diff --git
a/src/vm/jit/i386/linux/md-os.c
b/src/vm/jit/i386/linux/md-os.c
index de50d8115332e588a0ebd814d09b5aa5b89b7ad1..92bb757315c97b42ed1451fc7ce72c295b7c0ad8 100644
(file)
--- a/
src/vm/jit/i386/linux/md-os.c
+++ b/
src/vm/jit/i386/linux/md-os.c
@@
-43,6
+43,7
@@
#include "vm/stringlocal.h"
#include "vm/jit/asmpart.h"
#include "vm/stringlocal.h"
#include "vm/jit/asmpart.h"
+#include "vm/jit/executionstate.h"
#include "vm/jit/stacktrace.h"
#include "vm/jit/stacktrace.h"
@@
-300,14
+301,13
@@
void md_signal_handler_sigusr2(int sig, siginfo_t *siginfo, void *_p)
#endif
#endif
-/* md_
replace_executionstate_read
**********************************************
+/* md_
executionstate_read ********
**********************************************
Read the given context into an executionstate for Replacement.
*******************************************************************************/
Read the given context into an executionstate for Replacement.
*******************************************************************************/
-#if defined(ENABLE_REPLACEMENT)
-void md_replace_executionstate_read(executionstate_t *es, void *context)
+void md_executionstate_read(executionstate_t *es, void *context)
{
ucontext_t *_uc;
mcontext_t *_mc;
{
ucontext_t *_uc;
mcontext_t *_mc;
@@
-329,17
+329,15
@@
void md_replace_executionstate_read(executionstate_t *es, void *context)
for (i = 0; i < FLT_REG_CNT; i++)
es->fltregs[i] = 0xdeadbeefdeadbeefULL;
}
for (i = 0; i < FLT_REG_CNT; i++)
es->fltregs[i] = 0xdeadbeefdeadbeefULL;
}
-#endif
-/* md_
replace_executionstate_write
*********************************************
+/* md_
executionstate_write ********
*********************************************
Write the given executionstate back to the context for Replacement.
*******************************************************************************/
Write the given executionstate back to the context for Replacement.
*******************************************************************************/
-#if defined(ENABLE_REPLACEMENT)
-void md_replace_executionstate_write(executionstate_t *es, void *context)
+void md_executionstate_write(executionstate_t *es, void *context)
{
ucontext_t *_uc;
mcontext_t *_mc;
{
ucontext_t *_uc;
mcontext_t *_mc;
@@
-356,7
+354,6
@@
void md_replace_executionstate_write(executionstate_t *es, void *context)
_mc->gregs[REG_EIP] = (ptrint) es->pc;
_mc->gregs[REG_ESP] = (ptrint) es->sp;
}
_mc->gregs[REG_EIP] = (ptrint) es->pc;
_mc->gregs[REG_ESP] = (ptrint) es->sp;
}
-#endif
/* md_critical_section_restart *************************************************
/* md_critical_section_restart *************************************************