diff options
author | Andreas Sandberg <andreas.sandberg@arm.com> | 2016-01-29 12:14:21 +0000 |
---|---|---|
committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2016-01-29 12:14:21 +0000 |
commit | b99fea78a6b0db9dcf7133c302991b8a7a8f8538 (patch) | |
tree | d92f89fbd5a03e9ce64ab74009687c1b8ec4f441 /ext/nomali/tests/nomali_test_helpers.h | |
parent | 1285d639eba6b95e31fb2b4aacae524d04ddf981 (diff) | |
download | gem5-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/tests/nomali_test_helpers.h')
-rw-r--r-- | ext/nomali/tests/nomali_test_helpers.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/ext/nomali/tests/nomali_test_helpers.h b/ext/nomali/tests/nomali_test_helpers.h index 9de491a2a..82d833830 100644 --- a/ext/nomali/tests/nomali_test_helpers.h +++ b/ext/nomali/tests/nomali_test_helpers.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"); @@ -25,6 +25,7 @@ #define E_NOMALI_BAIL(c) \ do { \ + nomali_error_t error; \ if ((error = (c)) != NOMALI_E_OK) { \ test_bail(# c " failed: %s (%i)", \ nomali_errstr(error), error); \ @@ -42,5 +43,18 @@ } \ } while (0) +#define NOMALI_TEST_REG(t, handle, reg, test) \ + do { \ + uint32_t value; \ + E_NOMALI_BAIL( \ + nomali_reg_read(handle, &value, (reg))); \ + if (!(test)) { \ + test_fail(t); \ + } else { \ + test_ok(t); \ + } \ + } while (0) + + #endif /* _TESTS_NOMALI_TEST_HELPERS_H */ |