Added: trunk/binutils-2.17/sim/bfin/dv-bfin_jtag.c (0 => 5259)
--- trunk/binutils-2.17/sim/bfin/dv-bfin_jtag.c (rev 0)
+++ trunk/binutils-2.17/sim/bfin/dv-bfin_jtag.c 2011-02-18 13:20:03 UTC (rev 5259)
@@ -0,0 +1,157 @@
+/* Blackfin JTAG model.
+
+ Copyright (C) 2010-2011 Free Software Foundation, Inc.
+ Contributed by Analog Devices, Inc.
+
+ This file is part of simulators.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "config.h"
+
+#include "sim-main.h"
+#include "devices.h"
+#include "dv-bfin_jtag.h"
+
+/* XXX: This is mostly a stub. There are more registers, but they're only
+ accessible via the JTAG scan chain and not the MMR interface. */
+
+struct bfin_jtag
+{
+ bu32 base;
+
+ /* Order after here is important -- matches hardware MMR layout. */
+ bu32 dspid;
+ bu32 _pad0;
+ bu32 dbgstat;
+};
+#define mmr_base() offsetof(struct bfin_jtag, dspid)
+#define mmr_offset(mmr) (offsetof(struct bfin_jtag, mmr) - mmr_base())
+
+static const char * const mmr_names[] = {
+ "DSPID", NULL, "DBGSTAT",
+};
+#define mmr_name(off) (mmr_names[(off) / 4] ? : "<INV>")
+
+static unsigned
+bfin_jtag_io_write_buffer (struct hw *me, const void *source, int space,
+ address_word addr, unsigned nr_bytes)
+{
+ struct bfin_jtag *jtag = hw_data (me);
+ bu32 mmr_off;
+ bu32 value;
+ bu32 *valuep;
+
+ value = dv_load_4 (source);
+ mmr_off = addr - jtag->base;
+ valuep = (void *)((unsigned long)jtag + mmr_base() + mmr_off);
+
+ HW_TRACE_WRITE ();
+
+ switch (mmr_off)
+ {
+ case mmr_offset(dbgstat):
+ dv_w1c_4 (valuep, value, ~0xc);
+ break;
+ case mmr_offset(dspid):
+ /* Discard writes to these. */
+ break;
+ default:
+ dv_bfin_mmr_invalid (me, addr, nr_bytes, true);
+ break;
+ }
+
+ return nr_bytes;
+}
+
+static unsigned
+bfin_jtag_io_read_buffer (struct hw *me, void *dest, int space,
+ address_word addr, unsigned nr_bytes)
+{
+ struct bfin_jtag *jtag = hw_data (me);
+ bu32 mmr_off;
+ bu32 value;
+ bu32 *valuep;
+
+ mmr_off = addr - jtag->base;
+ valuep = (void *)((unsigned long)jtag + mmr_base() + mmr_off);
+
+ HW_TRACE_READ ();
+
+ switch (mmr_off)
+ {
+ case mmr_offset(dbgstat):
+ case mmr_offset(dspid):
+ value = *valuep;
+ break;
+ default:
+ while (1) /* Core MMRs -> exception -> doesn't return. */
+ dv_bfin_mmr_invalid (me, addr, nr_bytes, false);
+ break;
+ }
+
+ dv_store_4 (dest, value);
+
+ return nr_bytes;
+}
+
+static void
+attach_bfin_jtag_regs (struct hw *me, struct bfin_jtag *jtag)
+{
+ address_word attach_address;
+ int attach_space;
+ unsigned attach_size;
+ reg_property_spec reg;
+
+ if (hw_find_property (me, "reg") == NULL)
+ hw_abort (me, "Missing \"reg\" property");
+
+ if (!hw_find_reg_array_property (me, "reg", 0, ®))
+ hw_abort (me, "\"reg\" property must contain three addr/size entries");
+
+ hw_unit_address_to_attach_address (hw_parent (me),
+ ®.address,
+ &attach_space, &attach_address, me);
+ hw_unit_size_to_attach_size (hw_parent (me), ®.size, &attach_size, me);
+
+ if (attach_size != BFIN_COREMMR_JTAG_SIZE)
+ hw_abort (me, "\"reg\" size must be %#x", BFIN_COREMMR_JTAG_SIZE);
+
+ hw_attach_address (hw_parent (me),
+ 0, attach_space, attach_address, attach_size, me);
+
+ jtag->base = attach_address;
+}
+
+static void
+bfin_jtag_finish (struct hw *me)
+{
+ struct bfin_jtag *jtag;
+
+ jtag = HW_ZALLOC (me, struct bfin_jtag);
+
+ set_hw_data (me, jtag);
+ set_hw_io_read_buffer (me, bfin_jtag_io_read_buffer);
+ set_hw_io_write_buffer (me, bfin_jtag_io_write_buffer);
+
+ attach_bfin_jtag_regs (me, jtag);
+
+ /* Initialize the JTAG state. */
+ jtag->dspid = bfin_model_get_dspid (hw_system (me));
+}
+
+const struct hw_descriptor dv_bfin_jtag_descriptor[] = {
+ {"bfin_jtag", bfin_jtag_finish,},
+ {NULL, NULL},
+};
Added: trunk/binutils-2.17/sim/bfin/dv-bfin_jtag.h (0 => 5259)
--- trunk/binutils-2.17/sim/bfin/dv-bfin_jtag.h (rev 0)
+++ trunk/binutils-2.17/sim/bfin/dv-bfin_jtag.h 2011-02-18 13:20:03 UTC (rev 5259)
@@ -0,0 +1,27 @@
+/* Blackfin JTAG model.
+
+ Copyright (C) 2010-2011 Free Software Foundation, Inc.
+ Contributed by Analog Devices, Inc.
+
+ This file is part of simulators.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef DV_BFIN_JTAG_H
+#define DV_BFIN_JTAG_H
+
+#define BFIN_COREMMR_JTAG_BASE 0xFFE05000
+#define BFIN_COREMMR_JTAG_SIZE (4 * 3)
+
+#endif
Modified: trunk/binutils-2.17/sim/bfin/machs.c (5258 => 5259)
--- trunk/binutils-2.17/sim/bfin/machs.c 2011-02-17 17:54:37 UTC (rev 5258)
+++ trunk/binutils-2.17/sim/bfin/machs.c 2011-02-18 13:20:03 UTC (rev 5259)
@@ -39,6 +39,7 @@
#include "dv-bfin_eppi.h"
#include "dv-bfin_evt.h"
#include "dv-bfin_gptimer.h"
+#include "dv-bfin_jtag.h"
#include "dv-bfin_mmu.h"
#include "dv-bfin_nfc.h"
#include "dv-bfin_otp.h"
@@ -708,6 +709,7 @@
CORE_DEVICE (cec, CEC),
CORE_DEVICE (ctimer, CTIMER),
CORE_DEVICE (evt, EVT),
+ CORE_DEVICE (jtag, JTAG),
CORE_DEVICE (mmu, MMU),
CORE_DEVICE (trace, TRACE),
};