From 8c73d10fe1045a91afe8bfd6f6e083264e203709 Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Thu, 25 Feb 2016 21:57:37 -0800 Subject: [PATCH] Support SCR address generation with __OFFSET at the end --- csrc/htif_emulator.h | 6 +++--- uncore | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csrc/htif_emulator.h b/csrc/htif_emulator.h index 134bca27..a948be15 100644 --- a/csrc/htif_emulator.h +++ b/csrc/htif_emulator.h @@ -24,17 +24,17 @@ class htif_emulator_t : public htif_pthread_t void set_clock_divisor(int divisor, int hold_cycles) { -#ifdef UNCORE_SCR__HTIF_IO_CLOCK_DIVISOR +#ifdef UNCORE_SCR__HTIF_IO_CLOCK_DIVISOR__OFFSET /* We only want to write the HTIF clock divisor SCR on targets where it * actually exists (there isn't one on the FPGA, for example). */ - write_cr(-1, UNCORE_SCR__HTIF_IO_CLOCK_DIVISOR, divisor | hold_cycles << 16); + write_cr(-1, UNCORE_SCR__HTIF_IO_CLOCK_DIVISOR__OFFSET, divisor | hold_cycles << 16); #endif } void start() { set_clock_divisor(5, 2); - write_cr(-1, UNCORE_SCR__MEMORY_CHANNEL_MUX_SELECT, memory_channel_mux_select); + write_cr(-1, UNCORE_SCR__MEMORY_CHANNEL_MUX_SELECT__OFFSET, memory_channel_mux_select); htif_pthread_t::start(); } diff --git a/uncore b/uncore index e8d35184..42549fd7 160000 --- a/uncore +++ b/uncore @@ -1 +1 @@ -Subproject commit e8d3518437c7cfd6544937441c9c2e758a8e48fc +Subproject commit 42549fd7cfa86075a82cbbd10adf6d41b3dcad67