Back-ported DVCon turorial changes
This commit is contained in:
		| @@ -1,38 +1,34 @@ | ||||
| //////////////////////////////////////////////////////////////////////////////// | ||||
| // Copyright (C) 2017, MINRES Technologies GmbH | ||||
| // All rights reserved. | ||||
| // | ||||
| // Redistribution and use in source and binary forms, with or without | ||||
| // modification, are permitted provided that the following conditions are met: | ||||
| // | ||||
| // 1. Redistributions of source code must retain the above copyright notice, | ||||
| //    this list of conditions and the following disclaimer. | ||||
| // | ||||
| // 2. 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. | ||||
| // | ||||
| // 3. Neither the name of the copyright holder 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 HOLDER 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. | ||||
| // | ||||
| // Contributors: | ||||
| //       eyck@minres.com - initial API and implementation | ||||
| // | ||||
| // | ||||
| //////////////////////////////////////////////////////////////////////////////// | ||||
| /******************************************************************************* | ||||
|  * Copyright (C) 2017, 2018 MINRES Technologies GmbH | ||||
|  * All rights reserved. | ||||
|  * | ||||
|  * Redistribution and use in source and binary forms, with or without | ||||
|  * modification, are permitted provided that the following conditions are met: | ||||
|  * | ||||
|  * 1. Redistributions of source code must retain the above copyright notice, | ||||
|  *    this list of conditions and the following disclaimer. | ||||
|  * | ||||
|  * 2. 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. | ||||
|  * | ||||
|  * 3. Neither the name of the copyright holder 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 HOLDER 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. | ||||
|  * | ||||
|  *******************************************************************************/ | ||||
|  | ||||
| #include <iss/arch/CORE_DEF_NAME.h> | ||||
| #include <iss/arch/riscv_hart_msu_vp.h> | ||||
| @@ -44,8 +40,8 @@ | ||||
|  | ||||
| #include <boost/format.hpp> | ||||
|  | ||||
| #include <iss/debugger/riscv_target_adapter.h> | ||||
| #include <array> | ||||
| #include <iss/debugger/riscv_target_adapter.h> | ||||
|  | ||||
| namespace iss { | ||||
| namespace CORE_DEF_NAME { | ||||
| @@ -101,14 +97,13 @@ protected: | ||||
|  | ||||
|     void gen_trap_check(llvm::BasicBlock *bb); | ||||
|  | ||||
|  | ||||
|     inline llvm::Value *gen_reg_load(unsigned i, unsigned level = 0) { | ||||
|         return this->builder.CreateLoad(get_reg_ptr(i), false); | ||||
|     } | ||||
|  | ||||
|     inline void gen_set_pc(virt_addr_t pc, unsigned reg_num) { | ||||
|         llvm::Value *next_pc_v = this->builder.CreateSExtOrTrunc(this->gen_const(traits<ARCH>::XLEN, pc.val), | ||||
|                                                                   this->get_type(traits<ARCH>::XLEN)); | ||||
|                                                                  this->get_type(traits<ARCH>::XLEN)); | ||||
|         this->builder.CreateStore(next_pc_v, get_reg_ptr(reg_num), true); | ||||
|     } | ||||
|  | ||||
| @@ -127,9 +122,9 @@ protected: | ||||
|     std::array<compile_func, LUT_SIZE_C> lut_00, lut_01, lut_10; | ||||
|     std::array<compile_func, LUT_SIZE> lut_11; | ||||
|  | ||||
| 	std::array<compile_func*, 4> qlut; | ||||
|     std::array<compile_func *, 4> qlut; | ||||
|  | ||||
| 	std::array<const uint32_t, 4> lutmasks = { { EXTR_MASK16, EXTR_MASK16, EXTR_MASK16, EXTR_MASK32 } }; | ||||
|     std::array<const uint32_t, 4> lutmasks = {{EXTR_MASK16, EXTR_MASK16, EXTR_MASK16, EXTR_MASK32}}; | ||||
|  | ||||
|     void expand_bit_mask(int pos, uint32_t mask, uint32_t value, uint32_t valid, uint32_t idx, compile_func lut[], | ||||
|                          compile_func f) { | ||||
| @@ -180,23 +175,23 @@ private: | ||||
|     }; | ||||
|  | ||||
|     /* «start generated code» */ | ||||
| 	std::array<InstructionDesriptor, 0> instr_descr = { { } }; | ||||
|     std::array<InstructionDesriptor, 0> instr_descr = {{}}; | ||||
|     /* «end generated code»  */ | ||||
|     /**************************************************************************** | ||||
|      * end opcode definitions | ||||
|      ****************************************************************************/ | ||||
|     std::tuple<vm::continuation_e, llvm::BasicBlock *> illegal_intruction(virt_addr_t &pc, code_word_t instr, | ||||
|                                                                           llvm::BasicBlock *bb) { | ||||
| 		this->gen_sync(iss::PRE_SYNC, instr_descr.size()); | ||||
|         this->gen_sync(iss::PRE_SYNC, instr_descr.size()); | ||||
|         this->builder.CreateStore(this->builder.CreateLoad(get_reg_ptr(traits<ARCH>::NEXT_PC), true), | ||||
|                                    get_reg_ptr(traits<ARCH>::PC), true); | ||||
|                                   get_reg_ptr(traits<ARCH>::PC), true); | ||||
|         this->builder.CreateStore( | ||||
|             this->builder.CreateAdd(this->builder.CreateLoad(get_reg_ptr(traits<ARCH>::ICOUNT), true), | ||||
|                                      this->gen_const(64U, 1)), | ||||
|                                     this->gen_const(64U, 1)), | ||||
|             get_reg_ptr(traits<ARCH>::ICOUNT), true); | ||||
|         pc = pc + ((instr & 3) == 3 ? 4 : 2); | ||||
|         this->gen_raise_trap(0, 2);     // illegal instruction trap | ||||
| 		this->gen_sync(iss::POST_SYNC, instr_descr.size()); | ||||
|         this->gen_raise_trap(0, 2); // illegal instruction trap | ||||
|         this->gen_sync(iss::POST_SYNC, instr_descr.size()); | ||||
|         this->gen_trap_check(this->leave_blk); | ||||
|         return std::make_tuple(iss::vm::BRANCH, nullptr); | ||||
|     } | ||||
| @@ -245,7 +240,7 @@ vm_impl<ARCH>::gen_single_inst_behavior(virt_addr_t &pc, unsigned int &inst_cnt, | ||||
|     } catch (trap_access &ta) { | ||||
|         throw trap_access(ta.id, pc.val); | ||||
|     } | ||||
|     if (insn == 0x0000006f || (insn&0xffff)==0xa001) throw simulation_stopped(0); // 'J 0' or 'C.J 0' | ||||
|     if (insn == 0x0000006f || (insn & 0xffff) == 0xa001) throw simulation_stopped(0); // 'J 0' or 'C.J 0' | ||||
|     // curr pc on stack | ||||
|     typename vm_impl<ARCH>::processing_pc_entry addr(*this, pc, paddr); | ||||
|     ++inst_cnt; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user