diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2018-02-21 12:07:01 +0000 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2018-05-16 17:20:27 +0000 |
| commit | 23c6e60409a580e53834f90c1de1438a8ac94e88 (patch) | |
| tree | de59605e447fa05621c6a41897cccb032e6c1b0e /src/arch/arm/semihosting.hh | |
| parent | abb21ba99f3ae910101fc9f17341a52039c0547b (diff) | |
| download | gem5-23c6e60409a580e53834f90c1de1438a8ac94e88.tar.xz | |
arch-arm: Add support for semihosting STDIO redirection
The Arm Semihosting layer currently assumes that the guest application
shares STDIO with gem5. This makes it hard to distinguish application
output from gem5's output and makes it impossible to redirect STDIN
when running in interactive mode. Add support for custom STDIO
redirection when instantiating the Semihosting model.
Change-Id: I3411a6b9bfb008ffc3087d8837f59be72bd1e8ae
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Anouk Van Laer <anouk.vanlaer@arm.com>
Reviewed-by: Jack Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/10021
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Diffstat (limited to 'src/arch/arm/semihosting.hh')
| -rw-r--r-- | src/arch/arm/semihosting.hh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/arch/arm/semihosting.hh b/src/arch/arm/semihosting.hh index 14c5f9d2d..581646021 100644 --- a/src/arch/arm/semihosting.hh +++ b/src/arch/arm/semihosting.hh @@ -244,6 +244,9 @@ class ArmSemihosting : public SimObject }; std::vector<std::unique_ptr<FileBase>> files; + FILE *stdin; + FILE *stdout; + FILE *stderr; protected: // Helper functions unsigned calcTickShift() const { @@ -342,11 +345,14 @@ class ArmSemihosting : public SimObject #undef SEMI_CALL static const SemiCall *getCall(uint32_t op, bool aarch64); + static FILE *getSTDIO(const char *stream_name, + const std::string &name, const char *mode); static const std::map<uint32_t, SemiCall> calls; static const std::vector<const char *> fmodes; static const std::map<uint64_t, const char *> exitCodes; static const std::vector<uint8_t> features; + static const std::map<const std::string, FILE *> stdioMap; }; #endif // __ARCH_ARM_SEMIHOSTING_HH__ |