summaryrefslogtreecommitdiff
path: root/ext/nomali/include
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2016-01-29 12:14:21 +0000
committerAndreas Sandberg <andreas.sandberg@arm.com>2016-01-29 12:14:21 +0000
commitb99fea78a6b0db9dcf7133c302991b8a7a8f8538 (patch)
treed92f89fbd5a03e9ce64ab74009687c1b8ec4f441 /ext/nomali/include
parent1285d639eba6b95e31fb2b4aacae524d04ddf981 (diff)
downloadgem5-b99fea78a6b0db9dcf7133c302991b8a7a8f8538.tar.xz
ext: Update NoMali to external rev f08e0a5
Update NoMali from external revision 9adf9d6 to f08e0a5 and bring in the following changes: f08e0a5 Add support for tracking address space state f11099e Fix job slot register handling when running new jobs b28c98e api: Add a reset callback 29ac4c3 tests: Update gitignore to cover all future test cases 1c6b893 Propagate reset calls to all job slots 8f8ec15 Remove redundant reg vector in MMU 85d90d2 tests: Fix incorrect extern declaration
Diffstat (limited to 'ext/nomali/include')
-rw-r--r--ext/nomali/include/libnomali/nomali.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/nomali/include/libnomali/nomali.h b/ext/nomali/include/libnomali/nomali.h
index 9af2a417a..05b4099b6 100644
--- a/ext/nomali/include/libnomali/nomali.h
+++ b/ext/nomali/include/libnomali/nomali.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014-2015 ARM Limited
+ * Copyright (c) 2014-2016 ARM Limited
* All rights reserved
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -85,6 +85,8 @@ enum {
NOMALI_CALLBACK_MEMREAD,
/** Model write physical memory callback */
NOMALI_CALLBACK_MEMWRITE,
+ /** Model reset callback */
+ NOMALI_CALLBACK_RESET,
/** Number of defined callbacks */
NOMALI_CALLBACK_NUM_CALLBACKS
@@ -125,6 +127,7 @@ typedef struct {
nomali_addr_t addr, uint32_t value);
uint32_t (*memread)(nomali_handle_t h, void *usr,
nomali_addr_t addr);
+ void (*reset)(nomali_handle_t h, void *usr);
} func;
} nomali_callback_t;