URL
https://opencores.org/ocsvn/or1k_old/or1k_old/trunk
Subversion Repositories or1k_old
Compare Revisions
- This comparison shows the changes necessary to convert path
/
- from Rev 731 to Rev 732
- ↔ Reverse comparison
Rev 731 → Rev 732
/trunk/or1ksim/sim-config.h
197,7 → 197,6
int superscalar; /* superscalara analysis */ |
int hazards; /* dependency hazards analysis */ |
int dependstats; /* dependency statistics */ |
int raw_range; /* raw register usage over time stats; range in cycles, 0 = disabled */ |
int sbuf_len; /* length of store buffer, zero if disabled */ |
} cpu; |
|
/trunk/or1ksim/sim-config.c
124,7 → 124,6
config.cpu.superscalar = 0; |
config.sim.history = 0; |
config.cpu.hazards = 0; |
config.cpu.raw_range = 0; |
config.cpu.dependstats = 0; |
config.cpu.sbuf_len = 0; |
config.cpu.upr = SPR_UPR_UP | SPR_UPR_DCP | SPR_UPR_ICP | SPR_UPR_DMP |
147,9 → 146,6
/* GPIO */ |
config.ngpios = 0; |
|
/* Tick timer */ |
config.tick.enabled = 0; |
|
/* PM */ |
config.pm.enabled = 0; |
#endif |
392,7 → 388,6
void memory_delayr (); |
void memory_delayw (); |
void cpu_sbuf_len (); |
void cpu_raw_range (); |
void eth_nethernets (); |
void eth_baseaddr (); |
void eth_irq (); |
459,7 → 454,7
{"debug", 0}, |
{"VAPI", 0}, |
{"ethernet",0}, |
{"tick", 0}, /* 10 */ |
{"", 0}, /* 10 */ |
{"immu", 0}, |
{"dmmu", 0}, |
{"ic", 0}, |
527,7 → 522,6
{5, "sr", "=0x%x", NULL, (void *)(&config.cpu.sr), 0}, |
{5, "hazards", "=%i", NULL, (void *)(&config.cpu.hazards), 0}, |
{5, "superscalar", "=%i", NULL, (void *)(&config.cpu.superscalar), 0}, |
{5, "raw_range", "=%i", cpu_raw_range, (void *)(&config.cpu.raw_range), 0}, |
{5, "dependstats", "=%i", NULL, (void *)(&config.cpu.dependstats), 0}, |
{5, "sbuf_len", "=%i", cpu_sbuf_len, (void *)(&config.cpu.sbuf_len), 0}, |
|
573,8 → 567,6
{9, "sockif", "=\"%s\"", eth_sockif, (void *)(&tempS[0]), 0}, |
{9, "vapi_id", "=0x%x", eth_vapi_id, (void *)(&tempUL), 0}, |
|
{10, "enabled", "=%i", NULL, (void *)(&config.tick.enabled), 0}, |
|
{11, "enabled", "=%i", immu_enabled, (void *)(&tempL), 0}, |
{11, "nsets", "=%i", immu_nsets, (void *)(&tempL), 0}, |
{11, "nways", "=%i", immu_nways, (void *)(&tempL), 0}, |
856,16 → 848,6
ERROR("invalid device number."); |
} |
|
void cpu_raw_range () { |
if (config.cpu.raw_range >= RAW_RANGE) { |
config.cpu.raw_range = RAW_RANGE - 1; |
WARNING("raw range too large; truncated."); |
} else if (config.cpu.raw_range < 0) { |
config.cpu.raw_range = 0; |
WARNING("raw range negative; disabled."); |
} |
} |
|
void cpu_sbuf_len () { |
if (config.cpu.sbuf_len >= MAX_SBUF_LEN) { |
config.cpu.sbuf_len = MAX_SBUF_LEN - 1; |
1435,9 → 1417,9
config.bpb.enabled, config.bpb.sbp_bnf_fwd, config.bpb.sbp_bf_fwd, config.bpb.btic, config.bpb.missdelay, config.bpb.hitdelay); |
|
fprintf (f, " cpu:{upr:0x%08x, ver:0x%04x, rev:0x%04x, superscalar:%i, hazards:%i, dependstats:%i,\n" |
" raw_range:%i, sr:0x%08x},\n", |
" sr:0x%08x},\n", |
config.cpu.upr, config.cpu.ver, config.cpu.rev, config.cpu.superscalar, config.cpu.hazards, config.cpu.dependstats, |
config.cpu.raw_range, config.cpu.sr); |
config.cpu.sr); |
|
fprintf (f, " sim:{debug:%i, verbose:%i, profile:%i, prof_fn:\"%s\", mprofile:%i, mprof_fn:\"%s\",\n", |
config.sim.debug, config.sim.verbose, config.sim.profile, config.sim.prof_fn, config.sim.mprofile, config.sim.mprof_fn); |