Skip to content
Snippets Groups Projects
Commit 5302fa3b authored by Anh Nguyen-Tuong's avatar Anh Nguyen-Tuong
Browse files

Merge branch 'master' of git.zephyr-software.com:allnp/peasoup_umbrella

parents e6d3a2fa 40821ee6
Branches
No related tags found
No related merge requests found
Pipeline #2752 canceled
...@@ -29,8 +29,15 @@ class ArchitectureDescription_t : virtual public IRDB_SDK::ArchitectureDescripti ...@@ -29,8 +29,15 @@ class ArchitectureDescription_t : virtual public IRDB_SDK::ArchitectureDescripti
{ {
public: public:
virtual ~ArchitectureDescription_t() {} virtual ~ArchitectureDescription_t() { }
ArchitectureDescription_t() : bits(0), ft(IRDB_SDK::adftNone), mt(IRDB_SDK::admtNone) {} ArchitectureDescription_t()
:
bits(0),
ft(IRDB_SDK::adftNone),
mt(IRDB_SDK::admtNone),
file_base(0)
{
}
int getBitWidth() const { return bits; } int getBitWidth() const { return bits; }
void setBitWidth(const int _bits) { bits=_bits; } void setBitWidth(const int _bits) { bits=_bits; }
......
...@@ -901,12 +901,12 @@ do_plugins() ...@@ -901,12 +901,12 @@ do_plugins()
# if this step is a stop before/after step, do it special, so we exit early. # if this step is a stop before/after step, do it special, so we exit early.
if [[ $stepname == $stop_before_step ]] || [[ $stepname == $stop_after_step ]]; then if [[ $stepname == $stop_before_step ]] || [[ $stepname == $stop_after_step ]]; then
# just run the step now. # just run the step now.
perform_step $stepname none "$plugin_path/thanos.exe --no-redirect "$thanos_plugins"" perform_step $stepname none "$PEASOUP_HOME/irdb-libs/plugins_install/thanos.exe --no-redirect "$thanos_plugins""
thanos_steps="" thanos_steps=""
thanos_plugins="" thanos_plugins=""
elif [[ $stepname == $dump_before_step ]] || [[ $stepname == $dump_after_step ]]; then elif [[ $stepname == $dump_before_step ]] || [[ $stepname == $dump_after_step ]]; then
# just run the step now. # just run the step now.
perform_step $stepname none "$plugin_path/thanos.exe "$thanos_plugins"" perform_step $stepname none "$PEASOUP_HOME/irdb-libs/plugins_install/thanos.exe "$thanos_plugins""
thanos_steps="" thanos_steps=""
thanos_plugins="" thanos_plugins=""
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment