* Makefile.in (MAIN_INCLUDE_DEPS): Delete.

(INCLUDE_DEPS,OPS_INCLUDE_DEPS): Delete.
	(sim-if.o): Use SIM_MAIN_DEPS.
	(arch.o,traps.o,devices.o): Ditto.
	(M32RBF_INCLUDE_DEPS): Use CGEN_MAIN_CPU_DEPS.
	(m32r.o,mloop.o,cpu.o,decode.o,sem.o,model.o): Simplify dependencies.
	(m32rx.o,mloopx.o,cpux.o,decodex.o,semx.o,modelx.o): Ditto.
	(stamp-arch): Pass mach=all to cgen-arch.
	* cpu.c,cpu.h,decode.c,model.c,sem-switch.c,sem.c: Regenerate.
	* m32r-sim.h (fr30bf_h_cr_[gs]et_handler): Declare.
	([GS]ET_H_CR): Define.
	(fr30bf_h_psw_[gs]et_handler): Declare.
	([GS]ET_H_PSW): Define.
	(fr30bf_h_accum_[gs]et_handler): Declare.
	([GS]ET_H_ACCUM): Define.
	(fr30xf_h_{cr,psw,accum}_[gs]et_handler): Declare.
	(fr30bf_h_accums_[gs]et_handler): Declare.
	([GS]ET_H_ACCUMS): Define.
	* sim-if.c (sim_open): Model probing code moved to sim-model.c.
	* m32r.c (WANT_CPU): Define as m32rbf.
	(all register access fns): Rename to ..._handler.
	* cpux.c,cpux.h,decodex.c,modelx.c,semx.c: Regenerate.
	* m32rx.c (WANT_CPU): Define as m32rxf.
	(all register access fns): Rename to ..._handler.
This commit is contained in:
Doug Evans
1999-01-06 03:04:25 +00:00
parent d9455383f9
commit 368fc7dba8
14 changed files with 7790 additions and 970 deletions

View File

@ -225,7 +225,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
{
#if WITH_SCACHE_PBB
#if WITH_SCACHE_PBB_M32RBF
m32rbf_pbb_after (current_cpu, sem_arg);
#endif
}
@ -244,7 +244,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
{
#if WITH_SCACHE_PBB
#if WITH_SCACHE_PBB_M32RBF
m32rbf_pbb_before (current_cpu, sem_arg);
#endif
}
@ -263,7 +263,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
{
#if WITH_SCACHE_PBB
#if WITH_SCACHE_PBB_M32RBF
#ifdef DEFINE_SWITCH
vpc = m32rbf_pbb_cti_chain (current_cpu, sem_arg,
pbb_br_npc_ptr, pbb_br_npc);
@ -291,7 +291,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
{
#if WITH_SCACHE_PBB
#if WITH_SCACHE_PBB_M32RBF
vpc = m32rbf_pbb_chain (current_cpu, sem_arg);
#ifdef DEFINE_SWITCH
BREAK (sem);
@ -313,7 +313,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
{
#if WITH_SCACHE_PBB
#if WITH_SCACHE_PBB_M32RBF
#ifdef DEFINE_SWITCH
/* In the switch case FAST_P is a constant, allowing several optimizations
in any called inline functions. */
@ -606,7 +606,7 @@ if (CPU (h_cond)) {
}
abuf->written = written;
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -631,7 +631,7 @@ if (CPU (h_cond)) {
}
abuf->written = written;
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -656,7 +656,7 @@ if (EQSI (* FLD (i_src1), * FLD (i_src2))) {
}
abuf->written = written;
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -681,7 +681,7 @@ if (EQSI (* FLD (i_src2), 0)) {
}
abuf->written = written;
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -706,7 +706,7 @@ if (GESI (* FLD (i_src2), 0)) {
}
abuf->written = written;
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -731,7 +731,7 @@ if (GTSI (* FLD (i_src2), 0)) {
}
abuf->written = written;
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -756,7 +756,7 @@ if (LESI (* FLD (i_src2), 0)) {
}
abuf->written = written;
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -781,7 +781,7 @@ if (LTSI (* FLD (i_src2), 0)) {
}
abuf->written = written;
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -806,7 +806,7 @@ if (NESI (* FLD (i_src2), 0)) {
}
abuf->written = written;
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -834,7 +834,7 @@ do {
}
} while (0);
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -862,7 +862,7 @@ do {
}
} while (0);
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -887,7 +887,7 @@ if (NOTBI (CPU (h_cond))) {
}
abuf->written = written;
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -912,7 +912,7 @@ if (NOTBI (CPU (h_cond))) {
}
abuf->written = written;
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -937,7 +937,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
}
abuf->written = written;
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -958,7 +958,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -979,7 +979,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -1178,7 +1178,7 @@ do {
}
} while (0);
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -1199,7 +1199,7 @@ do {
TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -1214,7 +1214,7 @@ do {
vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
{
SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr));
* FLD (i_dr) = opval;
TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
@ -1233,7 +1233,7 @@ do {
vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
{
SI opval = GETMEMSI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16)));
SI opval = GETMEMSI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)));
* FLD (i_dr) = opval;
TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
@ -1252,7 +1252,7 @@ do {
vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
{
SI opval = EXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
SI opval = EXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr)));
* FLD (i_dr) = opval;
TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
@ -1271,7 +1271,7 @@ do {
vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
{
SI opval = EXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
@ -1290,7 +1290,7 @@ do {
vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
{
SI opval = EXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
SI opval = EXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr)));
* FLD (i_dr) = opval;
TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
@ -1309,7 +1309,7 @@ do {
vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
{
SI opval = EXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
@ -1328,7 +1328,7 @@ do {
vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr)));
* FLD (i_dr) = opval;
TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
@ -1347,7 +1347,7 @@ do {
vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
@ -1366,7 +1366,7 @@ do {
vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr)));
* FLD (i_dr) = opval;
TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
@ -1385,7 +1385,7 @@ do {
vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
@ -1405,7 +1405,7 @@ do {
do {
SI temp1;SI temp0;
temp0 = GETMEMSI (current_cpu, * FLD (i_sr));
temp0 = GETMEMSI (current_cpu, pc, * FLD (i_sr));
temp1 = ADDSI (* FLD (i_sr), 4);
{
SI opval = temp0;
@ -1496,7 +1496,7 @@ do {
TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
}
{
SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr));
* FLD (i_dr) = opval;
TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
@ -1972,7 +1972,7 @@ do {
}
} while (0);
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -2178,7 +2178,7 @@ do {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, * FLD (i_src2), opval);
SETMEMSI (current_cpu, pc, * FLD (i_src2), opval);
TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
@ -2197,7 +2197,7 @@ do {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
SETMEMSI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
@ -2216,7 +2216,7 @@ do {
{
QI opval = * FLD (i_src1);
SETMEMQI (current_cpu, * FLD (i_src2), opval);
SETMEMQI (current_cpu, pc, * FLD (i_src2), opval);
TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
@ -2235,7 +2235,7 @@ do {
{
QI opval = * FLD (i_src1);
SETMEMQI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
@ -2254,7 +2254,7 @@ do {
{
HI opval = * FLD (i_src1);
SETMEMHI (current_cpu, * FLD (i_src2), opval);
SETMEMHI (current_cpu, pc, * FLD (i_src2), opval);
TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
@ -2273,7 +2273,7 @@ do {
{
HI opval = * FLD (i_src1);
SETMEMHI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
SETMEMHI (current_cpu, pc, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
@ -2295,7 +2295,7 @@ do {
tmp_new_src2 = ADDSI (* FLD (i_src2), 4);
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, tmp_new_src2, opval);
SETMEMSI (current_cpu, pc, tmp_new_src2, opval);
TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
{
@ -2323,7 +2323,7 @@ do {
tmp_new_src2 = SUBSI (* FLD (i_src2), 4);
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, tmp_new_src2, opval);
SETMEMSI (current_cpu, pc, tmp_new_src2, opval);
TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
{
@ -2457,7 +2457,7 @@ do {
}
} while (0);
SEM_BRANCH_FINI
SEM_BRANCH_FINI (vpc);
#undef FLD
}
NEXT (vpc);
@ -2475,7 +2475,7 @@ do {
if (CPU (h_lock)) {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, * FLD (i_src2), opval);
SETMEMSI (current_cpu, pc, * FLD (i_src2), opval);
written |= (1 << 3);
TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}