dev: Terminal output's dump name conflicts

The recently Terminal dump options name introduced
in patch 1c72e90 conflict with MacOS stdio.h header.

From stdio.h:

#define	stdin	__stdinp
#define	stdout	__stdoutp
#define	stderr	__stderrp

To remove this conflict, the TerminalDump options are renamed.

Change-Id: I1b60fa1031328fc32d6a58bf7889b6e479d95219
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20959
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Andrea Mondelli
2019-09-17 14:20:37 -04:00
parent f85cdccf41
commit dc2db5cf9b
2 changed files with 3 additions and 3 deletions

View File

@@ -44,7 +44,7 @@ from m5.proxy import *
from m5.objects.Serial import SerialDevice
class TerminalDump(Enum): vals = ["none", "stdout", "stderr", "file"]
class TerminalDump(Enum): vals = ["none", "stdoutput", "stderror", "file"]
class Terminal(SerialDevice):
type = 'Terminal'

View File

@@ -151,9 +151,9 @@ Terminal::terminalDump(const TerminalParams* p)
switch (p->outfile) {
case Enums::TerminalDump::none:
return nullptr;
case Enums::TerminalDump::stdout:
case Enums::TerminalDump::stdoutput:
return simout.findOrCreate("stdout");
case Enums::TerminalDump::stderr:
case Enums::TerminalDump::stderror:
return simout.findOrCreate("stderr");
case Enums::TerminalDump::file:
return simout.findOrCreate(p->name);