X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=riscv%2Fhtif.cc;h=8a9cd306d9108ed0b00d9d9ae09ac63412f462d8;hb=01db50f070d576e433d2b93ad061a0d8239e7b0c;hp=9aa9a7c22cf0bb1a5c60ba72c88410fa1ebbb1b8;hpb=d8a587dedc38d6c1ec7e1f1348da5a4daf0b7f1e;p=riscv-isa-sim.git diff --git a/riscv/htif.cc b/riscv/htif.cc index 9aa9a7c..8a9cd30 100644 --- a/riscv/htif.cc +++ b/riscv/htif.cc @@ -135,18 +135,18 @@ int htif_t::wait_for_packet() sim->mmu->store_uint64((p.addr+i)*HTIF_DATA_ALIGN, p.data[i]); break; case APP_CMD_READ_CONTROL_REG: - assert(p.addr == 16); + assert(p.addr == PCR_TOHOST); assert(p.data_size == 1); ackpacket.data_size = 1; memcpy(ackpacket.data, &sim->tohost, sizeof(reg_t)); break; case APP_CMD_WRITE_CONTROL_REG: - assert(p.addr == 17 || p.addr == 15); + assert(p.addr == PCR_FROMHOST || p.addr == PCR_RESET); assert(p.data_size == 1); sim->tohost = 0; - if (p.addr == 17) + if (p.addr == PCR_FROMHOST) memcpy(&sim->fromhost, p.data, sizeof(reg_t)); - else if (p.addr == 15) + else if (p.addr == PCR_RESET) { bool next_reset = p.data[0] & 1; if (!reset && next_reset)