folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

3b2: Preserve opcode values in history

Browse source
This commit is contained in:
Seth Morabito 2017-11-23 17:07:08 -08:00 • committed by Mark Pizzolato
parent be48e5809b
commit f6e63892b4
3 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
3B2/3b2_cpu.c
View file

@ -45,8 +45,8 @@ uint32 *RAM = NULL;
jmp_buf save_env;
volatile uint32 abort_context;
/* The last decoded instruction */
instr cpu_instr;
/* Pointer to the last decoded instruction */
instr *cpu_instr;
/* Circular buffer of instructions */
instr *INST = NULL;
@ -1368,6 +1368,8 @@ t_stat sim_instr(void)
uint32 width, offset;
t_uint64 mask;
instr inst;
operand *src1, *src2, *src3, *dst;
stop_reason = 0;
@ -1497,40 +1499,44 @@ t_stat sim_instr(void)
R[NUM_PSW] &= ~PSW_TM;
R[NUM_PSW] |= PSW_TM_MASK;
/* Decode the instruction */
memset(&cpu_instr, 0, sizeof(instr));
cpu_ilen = decode_instruction(&cpu_instr);
/* Record the instruction for history */
if (cpu_hist_size > 0) {
/* Shallow copy */
INST[cpu_hist_p] = cpu_instr;
INST[cpu_hist_p].valid = TRUE;
cpu_instr = &INST[cpu_hist_p];
cpu_hist_p = (cpu_hist_p + 1) % cpu_hist_size;
} else {
cpu_instr = &inst;
}
/* Decode the instruction */
memset(cpu_instr, 0, sizeof(instr));
cpu_ilen = decode_instruction(cpu_instr);
/* Make sure to update the valid bit for history keeping (if
* enabled) */
cpu_instr->valid = TRUE;
/*
* Operate on the decoded instruction.
*/
/* Get the operands */
if (cpu_instr.mn->src_op1 >= 0) {
src1 = &cpu_instr.operands[cpu_instr.mn->src_op1];
if (cpu_instr->mn->src_op1 >= 0) {
src1 = &cpu_instr->operands[cpu_instr->mn->src_op1];
}
if (cpu_instr.mn->src_op2 >= 0) {
src2 = &cpu_instr.operands[cpu_instr.mn->src_op2];
if (cpu_instr->mn->src_op2 >= 0) {
src2 = &cpu_instr->operands[cpu_instr->mn->src_op2];
}
if (cpu_instr.mn->src_op3 >= 0) {
src3 = &cpu_instr.operands[cpu_instr.mn->src_op3];
if (cpu_instr->mn->src_op3 >= 0) {
src3 = &cpu_instr->operands[cpu_instr->mn->src_op3];
}
if (cpu_instr.mn->dst_op >= 0) {
dst = &cpu_instr.operands[cpu_instr.mn->dst_op];
if (cpu_instr->mn->dst_op >= 0) {
dst = &cpu_instr->operands[cpu_instr->mn->dst_op];
}
switch (cpu_instr.mn->opcode) {
switch (cpu_instr->mn->opcode) {
case ADDW2:
case ADDH2:
case ADDB2:

2
3B2/3b2_defs.h
View file

@ -53,7 +53,7 @@ noret __libc_longjmp (jmp_buf buf, int val);
/* -v flag for examine routine */
#define EX_V_FLAG 1 << 21
#define MAX_HIST_SIZE 1000000
#define MAX_HIST_SIZE 10000000
#define MIN_HIST_SIZE 64
#define MAXMEMSIZE (1 << 22) /* 4 MB */
#define MEM_SIZE (cpu_unit.capac) /* actual memory size */

4
3B2/3b2_sys.c
View file

@ -45,7 +45,7 @@ REG *sim_PC = &cpu_reg[0];
there may be up to 3 operands, for a maximum of 20 bytes */
int32 sim_emax = 20;
extern instr cpu_instr;
extern instr *cpu_instr;
DEVICE *sim_devices[] = {
&cpu_dev,
@ -153,7 +153,7 @@ t_stat fprint_sym(FILE *of, t_addr addr, t_value *val, UNIT *uptr, int32 sw)
}
if (sw & (int32) SWMASK('M')) {
fprint_sym_m(of, &cpu_instr);
fprint_sym_m(of, cpu_instr);
return SCPE_OK;
}