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
/
alpha
/
linux
/
md-os.c
diff --git
a/src/vm/jit/alpha/linux/md-os.c
b/src/vm/jit/alpha/linux/md-os.c
index c080a7bc22a6837b633a89beb10aed9d5030f08a..08a85f07e6e33425b3983a0792dc28df980f44e0 100644
(file)
--- a/
src/vm/jit/alpha/linux/md-os.c
+++ b/
src/vm/jit/alpha/linux/md-os.c
@@
-42,8
+42,11
@@
#include "vm/signallocal.h"
#include "vm/jit/asmpart.h"
#include "vm/signallocal.h"
#include "vm/jit/asmpart.h"
+#include "vm/jit/executionstate.h"
#include "vm/jit/stacktrace.h"
#include "vm/jit/stacktrace.h"
+#include "vmcore/system.h"
+
/* md_signal_handler_sigsegv ***************************************************
/* md_signal_handler_sigsegv ***************************************************
@@
-204,18
+207,17
@@
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.
*******************************************************************************/
*******************************************************************************/
-#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;
-
s4
i;
+
int
i;
_uc = (ucontext_t *) context;
_mc = &_uc->uc_mcontext;
_uc = (ucontext_t *) context;
_mc = &_uc->uc_mcontext;
@@
-235,23
+237,21
@@
void md_replace_executionstate_read(executionstate_t *es, void *context)
* the _mc->sc_fpregs[i] can cause invalid conversions. */
assert(sizeof(_mc->sc_fpregs) == sizeof(es->fltregs));
* the _mc->sc_fpregs[i] can cause invalid conversions. */
assert(sizeof(_mc->sc_fpregs) == sizeof(es->fltregs));
- memcpy(&es->fltregs, &_mc->sc_fpregs, sizeof(_mc->sc_fpregs));
+
system_
memcpy(&es->fltregs, &_mc->sc_fpregs, sizeof(_mc->sc_fpregs));
}
}
-#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.
*******************************************************************************/
*******************************************************************************/
-#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;
-
s4
i;
+
int
i;
_uc = (ucontext_t *) context;
_mc = &_uc->uc_mcontext;
_uc = (ucontext_t *) context;
_mc = &_uc->uc_mcontext;
@@
-265,7
+265,7
@@
void md_replace_executionstate_write(executionstate_t *es, void *context)
* the _mc->sc_fpregs[i] can cause invalid conversions. */
assert(sizeof(_mc->sc_fpregs) == sizeof(es->fltregs));
* the _mc->sc_fpregs[i] can cause invalid conversions. */
assert(sizeof(_mc->sc_fpregs) == sizeof(es->fltregs));
- memcpy(&_mc->sc_fpregs, &es->fltregs, sizeof(_mc->sc_fpregs));
+
system_
memcpy(&_mc->sc_fpregs, &es->fltregs, sizeof(_mc->sc_fpregs));
/* write special registers */
_mc->sc_pc = (ptrint) es->pc;
/* write special registers */
_mc->sc_pc = (ptrint) es->pc;
@@
-273,7
+273,6
@@
void md_replace_executionstate_write(executionstate_t *es, void *context)
_mc->sc_regs[REG_PV] = (ptrint) es->pv;
_mc->sc_regs[REG_RA] = (ptrint) es->ra;
}
_mc->sc_regs[REG_PV] = (ptrint) es->pv;
_mc->sc_regs[REG_RA] = (ptrint) es->ra;
}
-#endif
/* md_critical_section_restart *************************************************
/* md_critical_section_restart *************************************************