Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cxxrtl: Use the base name of the interface file for the include directive #4063

Merged
merged 3 commits into from
Dec 13, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion backends/cxxrtl/cxxrtl_backend.cc
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,22 @@ std::string escape_cxx_string(const std::string &input)
return output;
}

std::string basename(const std::string &filepath)
{
#ifndef _WIN32
Henkru marked this conversation as resolved.
Show resolved Hide resolved
const std::string dir_seps = "/";
#else
const std::string dir_seps = "\\/";
#endif
size_t sep_pos = filepath.find_last_of(dir_seps);
if (sep_pos != std::string::npos && sep_pos + 1 < filepath.length()) {
whitequark marked this conversation as resolved.
Show resolved Hide resolved
return filepath.substr(sep_pos + 1);
}
else {
return filepath;
}
}

template<class T>
std::string get_hdl_name(T *object)
{
Expand Down Expand Up @@ -2571,7 +2587,7 @@ struct CxxrtlWorker {
}

if (split_intf)
f << "#include \"" << intf_filename << "\"\n";
f << "#include \"" << basename(intf_filename) << "\"\n";
else
f << "#include <cxxrtl/cxxrtl.h>\n";
if (has_prints)
Expand Down