website: Made changes to learning_gem5 tutorial Changed variable names in part1_3 to match the files linked in that tutorial, and changed pointers + references in part2_4 to be in line with files linked in that tutorial. Change-Id: If59405bd6d2de3710b8eda785b3e28090b20ae11 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5-website/+/47840 Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu> Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu> Tested-by: Bobby R. Bruce <bbruce@ucdavis.edu>
diff --git a/_pages/documentation/learning_gem5/part1/part1_3_cache_config.md b/_pages/documentation/learning_gem5/part1/part1_3_cache_config.md index f53ca8e..79de5a6 100644 --- a/_pages/documentation/learning_gem5/part1/part1_3_cache_config.md +++ b/_pages/documentation/learning_gem5/part1/part1_3_cache_config.md
@@ -147,7 +147,7 @@ raise NotImplementedError def connectBus(self, bus): - self.mem_side = bus.slave + self.mem_side = bus.cpu_side_ports ``` Next, we have to define a separate `connectCPU` function for the @@ -173,10 +173,10 @@ ``` def connectCPUSideBus(self, bus): - self.cpu_side = bus.master + self.cpu_side = bus.mem_side_ports def connectMemSideBus(self, bus): - self.mem_side = bus.slave + self.mem_side = bus.cpu_side_ports ``` The full file can be found in the gem5 source at
diff --git a/_pages/documentation/learning_gem5/part2/part2_4_parameters.md b/_pages/documentation/learning_gem5/part2/part2_4_parameters.md index 127d701..4d93ad1 100644 --- a/_pages/documentation/learning_gem5/part2/part2_4_parameters.md +++ b/_pages/documentation/learning_gem5/part2/part2_4_parameters.md
@@ -68,12 +68,12 @@ code shows the changes to the `HelloObject` constructor. ```cpp -HelloObject::HelloObject(HelloObjectParams *params) : +HelloObject::HelloObject(const HelloObjectParams ¶ms) : SimObject(params), event(*this), - myName(params->name), - latency(params->time_to_wait), - timesLeft(params->number_of_fires) + myName(params.name), + latency(params.time_to_wait), + timesLeft(params.number_of_fires) { DPRINTF(Hello, "Created the hello object with the name %s\n", myName); } @@ -275,9 +275,9 @@ #include "debug/Hello.hh" #include "sim/sim_exit.hh" -GoodbyeObject::GoodbyeObject(GoodbyeObjectParams *params) : - SimObject(params), event(*this), bandwidth(params->write_bandwidth), - bufferSize(params->buffer_size), buffer(nullptr), bufferUsed(0) +GoodbyeObject::GoodbyeObject(const GoodbyeObjectParams ¶ms) : + SimObject(params), event(*this), bandwidth(params.write_bandwidth), + bufferSize(params.buffer_size), buffer(nullptr), bufferUsed(0) { buffer = new char[bufferSize]; DPRINTF(Hello, "Created the goodbye object\n"); @@ -436,13 +436,13 @@ #include "base/misc.hh" #include "debug/Hello.hh" -HelloObject::HelloObject(HelloObjectParams *params) : +HelloObject::HelloObject(HelloObjectParams ¶ms) : SimObject(params), event(*this), - goodbye(params->goodbye_object), - myName(params->name), - latency(params->time_to_wait), - timesLeft(params->number_of_fires) + goodbye(params.goodbye_object), + myName(params.name), + latency(params.time_to_wait), + timesLeft(params.number_of_fires) { DPRINTF(Hello, "Created the hello object with the name %s\n", myName); panic_if(!goodbye, "HelloObject must have a non-null GoodbyeObject");