From 9e340ba626f6e261246e75703604414b5623484e Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 8 Feb 2019 14:48:12 -0800 Subject: systemc: Add a systemc_home directory which maps to the ext headers. Some systemc code bases expect to find a SYSTEMC_HOME environment variable which points to the installed header files provided by systemc, all under ${SYSTEMC_HOME}/include. The systemc headers in gem5 are not supposed to be installed anywhere, but to satisfy those expectations this change creates a dummy systemc_home directory with an include/ in it which has headers which just include the actual headers in src/systemc/ext. More gem5 aware code bases can still access the headers either by letting gem5's scons environment -I the ext directory, or can do so themselves if they're not being built by gem5's scons. Change-Id: I5f2e6bfcf20dd314d525207c2e13ca53474a33f3 Reviewed-on: https://gem5-review.googlesource.com/c/16263 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/ext/systemc_home/include/systemc | 30 ++++++++++++++++++++++ src/systemc/ext/systemc_home/include/systemc.h | 30 ++++++++++++++++++++++ src/systemc/ext/systemc_home/include/tlm | 20 +++++++++++++++ src/systemc/ext/systemc_home/include/tlm.h | 20 +++++++++++++++ .../include/tlm_utils/convenience_socket_bases.h | 20 +++++++++++++++ .../tlm_utils/instance_specific_extensions.h | 20 +++++++++++++++ .../tlm_utils/instance_specific_extensions_int.h | 20 +++++++++++++++ .../tlm_utils/multi_passthrough_initiator_socket.h | 20 +++++++++++++++ .../tlm_utils/multi_passthrough_target_socket.h | 20 +++++++++++++++ .../include/tlm_utils/multi_socket_bases.h | 20 +++++++++++++++ .../include/tlm_utils/passthrough_target_socket.h | 20 +++++++++++++++ .../include/tlm_utils/peq_with_cb_and_phase.h | 20 +++++++++++++++ .../systemc_home/include/tlm_utils/peq_with_get.h | 20 +++++++++++++++ .../include/tlm_utils/simple_initiator_socket.h | 20 +++++++++++++++ .../include/tlm_utils/simple_target_socket.h | 20 +++++++++++++++ .../include/tlm_utils/tlm_quantumkeeper.h | 20 +++++++++++++++ 16 files changed, 340 insertions(+) create mode 100644 src/systemc/ext/systemc_home/include/systemc create mode 100644 src/systemc/ext/systemc_home/include/systemc.h create mode 100644 src/systemc/ext/systemc_home/include/tlm create mode 100644 src/systemc/ext/systemc_home/include/tlm.h create mode 100644 src/systemc/ext/systemc_home/include/tlm_utils/convenience_socket_bases.h create mode 100644 src/systemc/ext/systemc_home/include/tlm_utils/instance_specific_extensions.h create mode 100644 src/systemc/ext/systemc_home/include/tlm_utils/instance_specific_extensions_int.h create mode 100644 src/systemc/ext/systemc_home/include/tlm_utils/multi_passthrough_initiator_socket.h create mode 100644 src/systemc/ext/systemc_home/include/tlm_utils/multi_passthrough_target_socket.h create mode 100644 src/systemc/ext/systemc_home/include/tlm_utils/multi_socket_bases.h create mode 100644 src/systemc/ext/systemc_home/include/tlm_utils/passthrough_target_socket.h create mode 100644 src/systemc/ext/systemc_home/include/tlm_utils/peq_with_cb_and_phase.h create mode 100644 src/systemc/ext/systemc_home/include/tlm_utils/peq_with_get.h create mode 100644 src/systemc/ext/systemc_home/include/tlm_utils/simple_initiator_socket.h create mode 100644 src/systemc/ext/systemc_home/include/tlm_utils/simple_target_socket.h create mode 100644 src/systemc/ext/systemc_home/include/tlm_utils/tlm_quantumkeeper.h (limited to 'src') diff --git a/src/systemc/ext/systemc_home/include/systemc b/src/systemc/ext/systemc_home/include/systemc new file mode 100644 index 000000000..60837f0d7 --- /dev/null +++ b/src/systemc/ext/systemc_home/include/systemc @@ -0,0 +1,30 @@ +/* + * Copyright 2019 Google, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Authors: Gabe Black + */ + +#include "../../systemc" diff --git a/src/systemc/ext/systemc_home/include/systemc.h b/src/systemc/ext/systemc_home/include/systemc.h new file mode 100644 index 000000000..0b2c30cd4 --- /dev/null +++ b/src/systemc/ext/systemc_home/include/systemc.h @@ -0,0 +1,30 @@ +/* + * Copyright 2019 Google, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Authors: Gabe Black + */ + +#include "../../systemc.h" diff --git a/src/systemc/ext/systemc_home/include/tlm b/src/systemc/ext/systemc_home/include/tlm new file mode 100644 index 000000000..114701d6d --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../tlm" diff --git a/src/systemc/ext/systemc_home/include/tlm.h b/src/systemc/ext/systemc_home/include/tlm.h new file mode 100644 index 000000000..114701d6d --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../tlm" diff --git a/src/systemc/ext/systemc_home/include/tlm_utils/convenience_socket_bases.h b/src/systemc/ext/systemc_home/include/tlm_utils/convenience_socket_bases.h new file mode 100644 index 000000000..e20b88da9 --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm_utils/convenience_socket_bases.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../../tlm_utils/convenience_socket_bases.h" diff --git a/src/systemc/ext/systemc_home/include/tlm_utils/instance_specific_extensions.h b/src/systemc/ext/systemc_home/include/tlm_utils/instance_specific_extensions.h new file mode 100644 index 000000000..090f11dbc --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm_utils/instance_specific_extensions.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../../tlm_utils/instance_specific_extensions.h" diff --git a/src/systemc/ext/systemc_home/include/tlm_utils/instance_specific_extensions_int.h b/src/systemc/ext/systemc_home/include/tlm_utils/instance_specific_extensions_int.h new file mode 100644 index 000000000..f756732c0 --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm_utils/instance_specific_extensions_int.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../../tlm_utils/instance_specific_extensions_int.h" diff --git a/src/systemc/ext/systemc_home/include/tlm_utils/multi_passthrough_initiator_socket.h b/src/systemc/ext/systemc_home/include/tlm_utils/multi_passthrough_initiator_socket.h new file mode 100644 index 000000000..f034502e3 --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm_utils/multi_passthrough_initiator_socket.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../../tlm_utils/multi_passthrough_initiator_socket.h" diff --git a/src/systemc/ext/systemc_home/include/tlm_utils/multi_passthrough_target_socket.h b/src/systemc/ext/systemc_home/include/tlm_utils/multi_passthrough_target_socket.h new file mode 100644 index 000000000..5676f63b6 --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm_utils/multi_passthrough_target_socket.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../../tlm_utils/multi_passthrough_target_socket.h" diff --git a/src/systemc/ext/systemc_home/include/tlm_utils/multi_socket_bases.h b/src/systemc/ext/systemc_home/include/tlm_utils/multi_socket_bases.h new file mode 100644 index 000000000..a53679e11 --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm_utils/multi_socket_bases.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../../tlm_utils/multi_socket_bases.h" diff --git a/src/systemc/ext/systemc_home/include/tlm_utils/passthrough_target_socket.h b/src/systemc/ext/systemc_home/include/tlm_utils/passthrough_target_socket.h new file mode 100644 index 000000000..f10426103 --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm_utils/passthrough_target_socket.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../../tlm_utils/passthrough_target_socket.h" diff --git a/src/systemc/ext/systemc_home/include/tlm_utils/peq_with_cb_and_phase.h b/src/systemc/ext/systemc_home/include/tlm_utils/peq_with_cb_and_phase.h new file mode 100644 index 000000000..3456d7943 --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm_utils/peq_with_cb_and_phase.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../../tlm_utils/peq_with_cb_and_phase.h" diff --git a/src/systemc/ext/systemc_home/include/tlm_utils/peq_with_get.h b/src/systemc/ext/systemc_home/include/tlm_utils/peq_with_get.h new file mode 100644 index 000000000..77e5555e3 --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm_utils/peq_with_get.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../../tlm_utils/peq_with_get.h" diff --git a/src/systemc/ext/systemc_home/include/tlm_utils/simple_initiator_socket.h b/src/systemc/ext/systemc_home/include/tlm_utils/simple_initiator_socket.h new file mode 100644 index 000000000..b285f8ccf --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm_utils/simple_initiator_socket.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../../tlm_utils/simple_initiator_socket.h" diff --git a/src/systemc/ext/systemc_home/include/tlm_utils/simple_target_socket.h b/src/systemc/ext/systemc_home/include/tlm_utils/simple_target_socket.h new file mode 100644 index 000000000..f9555ed2f --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm_utils/simple_target_socket.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../../tlm_utils/simple_target_socket.h" diff --git a/src/systemc/ext/systemc_home/include/tlm_utils/tlm_quantumkeeper.h b/src/systemc/ext/systemc_home/include/tlm_utils/tlm_quantumkeeper.h new file mode 100644 index 000000000..8c71156c2 --- /dev/null +++ b/src/systemc/ext/systemc_home/include/tlm_utils/tlm_quantumkeeper.h @@ -0,0 +1,20 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#include "../../../tlm_utils/tlm_quantumkeeper.h" -- cgit v1.2.3