<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Sat, Mar 24, 2018 at 12:18 AM Craig Topper via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ctopper<br>
Date: Sat Mar 24 00:15:47 2018<br>
New Revision: 328413<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=328413&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=328413&view=rev</a><br>
Log:<br>
[X86] Use unique_ptr to simplify memory management. NFC<br>
<br>
Modified:<br>
llvm/trunk/utils/TableGen/X86DisassemblerShared.h<br>
llvm/trunk/utils/TableGen/X86DisassemblerTables.cpp<br>
llvm/trunk/utils/TableGen/X86DisassemblerTables.h<br>
llvm/trunk/utils/TableGen/X86RecognizableInstr.cpp<br>
<br>
Modified: llvm/trunk/utils/TableGen/X86DisassemblerShared.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86DisassemblerShared.h?rev=328413&r1=328412&r2=328413&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86DisassemblerShared.h?rev=328413&r1=328412&r2=328413&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/utils/TableGen/X86DisassemblerShared.h (original)<br>
+++ llvm/trunk/utils/TableGen/X86DisassemblerShared.h Sat Mar 24 00:15:47 2018<br>
@@ -49,6 +49,10 @@ struct OpcodeDecision {<br>
/// entries in this table, rather than 2^(ATTR_max).<br>
struct ContextDecision {<br>
OpcodeDecision opcodeDecisions[llvm::X86Disassembler::IC_max];<br>
+<br>
+ ContextDecision() {<br>
+ memset(opcodeDecisions, 0, sizeof(opcodeDecisions));<br>
+ }<br>
};<br>
<br>
#endif<br>
<br>
Modified: llvm/trunk/utils/TableGen/X86DisassemblerTables.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86DisassemblerTables.cpp?rev=328413&r1=328412&r2=328413&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86DisassemblerTables.cpp?rev=328413&r1=328412&r2=328413&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/utils/TableGen/X86DisassemblerTables.cpp (original)<br>
+++ llvm/trunk/utils/TableGen/X86DisassemblerTables.cpp Sat Mar 24 00:15:47 2018<br>
@@ -644,21 +644,13 @@ static const char* stringForDecisionType<br>
}<br>
<br>
DisassemblerTables::DisassemblerTables() {<br>
- unsigned i;<br>
-<br>
- for (i = 0; i < array_lengthof(Tables); i++) {<br>
- Tables[i] = new ContextDecision;<br>
- memset(Tables[i], 0, sizeof(ContextDecision));<br>
- }<br>
+ for (unsigned i = 0; i < array_lengthof(Tables); i++)<br>
+ Tables[i] = llvm::make_unique<ContextDecision>();<br></blockquote><div><br>Might be tidier to use a range-based-for here?<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
HasConflicts = false;<br>
}<br>
<br>
DisassemblerTables::~DisassemblerTables() {<br>
- unsigned i;<br>
-<br>
- for (i = 0; i < array_lengthof(Tables); i++)<br>
- delete Tables[i];<br>
}<br>
<br>
void DisassemblerTables::emitModRMDecision(raw_ostream &o1, raw_ostream &o2,<br>
<br>
Modified: llvm/trunk/utils/TableGen/X86DisassemblerTables.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86DisassemblerTables.h?rev=328413&r1=328412&r2=328413&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86DisassemblerTables.h?rev=328413&r1=328412&r2=328413&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/utils/TableGen/X86DisassemblerTables.h (original)<br>
+++ llvm/trunk/utils/TableGen/X86DisassemblerTables.h Sat Mar 24 00:15:47 2018<br>
@@ -41,7 +41,7 @@ private:<br>
/// [4] XOP8 map opcode<br>
/// [5] XOP9 map opcode<br>
/// [6] XOPA map opcode<br>
- ContextDecision* Tables[7];<br>
+ std::unique_ptr<ContextDecision> Tables[7];<br>
<br>
// Table of ModRM encodings.<br>
typedef std::map<std::vector<unsigned>, unsigned> ModRMMapTy;<br>
<br>
Modified: llvm/trunk/utils/TableGen/X86RecognizableInstr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86RecognizableInstr.cpp?rev=328413&r1=328412&r2=328413&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86RecognizableInstr.cpp?rev=328413&r1=328412&r2=328413&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/utils/TableGen/X86RecognizableInstr.cpp (original)<br>
+++ llvm/trunk/utils/TableGen/X86RecognizableInstr.cpp Sat Mar 24 00:15:47 2018<br>
@@ -695,7 +695,7 @@ void RecognizableInstr::emitDecodePath(D<br>
case X86Local::ThreeDNow: opcodeType = TWOBYTE; break;<br>
}<br>
<br>
- ModRMFilter *filter = nullptr;<br>
+ std::unique_ptr<ModRMFilter> filter;<br>
switch (Form) {<br>
default: llvm_unreachable("Invalid form!");<br>
case X86Local::Pseudo: llvm_unreachable("Pseudo should not be emitted!");<br>
@@ -707,36 +707,36 @@ void RecognizableInstr::emitDecodePath(D<br>
case X86Local::RawFrmDstSrc:<br>
case X86Local::RawFrmImm8:<br>
case X86Local::RawFrmImm16:<br>
- filter = new DumbFilter();<br>
+ filter = llvm::make_unique<DumbFilter>();<br>
break;<br>
case X86Local::MRMDestReg:<br>
case X86Local::MRMSrcReg:<br>
case X86Local::MRMSrcReg4VOp3:<br>
case X86Local::MRMSrcRegOp4:<br>
case X86Local::MRMXr:<br>
- filter = new ModFilter(true);<br>
+ filter = llvm::make_unique<ModFilter>(true);<br>
break;<br>
case X86Local::MRMDestMem:<br>
case X86Local::MRMSrcMem:<br>
case X86Local::MRMSrcMem4VOp3:<br>
case X86Local::MRMSrcMemOp4:<br>
case X86Local::MRMXm:<br>
- filter = new ModFilter(false);<br>
+ filter = llvm::make_unique<ModFilter>(false);<br>
break;<br>
case X86Local::MRM0r: case X86Local::MRM1r:<br>
case X86Local::MRM2r: case X86Local::MRM3r:<br>
case X86Local::MRM4r: case X86Local::MRM5r:<br>
case X86Local::MRM6r: case X86Local::MRM7r:<br>
- filter = new ExtendedFilter(true, Form - X86Local::MRM0r);<br>
+ filter = llvm::make_unique<ExtendedFilter>(true, Form - X86Local::MRM0r);<br>
break;<br>
case X86Local::MRM0m: case X86Local::MRM1m:<br>
case X86Local::MRM2m: case X86Local::MRM3m:<br>
case X86Local::MRM4m: case X86Local::MRM5m:<br>
case X86Local::MRM6m: case X86Local::MRM7m:<br>
- filter = new ExtendedFilter(false, Form - X86Local::MRM0m);<br>
+ filter = llvm::make_unique<ExtendedFilter>(false, Form - X86Local::MRM0m);<br>
break;<br>
X86_INSTR_MRM_MAPPING<br>
- filter = new ExactFilter(0xC0 + Form - X86Local::MRM_C0); \<br>
+ filter = llvm::make_unique<ExactFilter>(0xC0 + Form - X86Local::MRM_C0);<br>
break;<br>
} // switch (Form)<br>
<br>
@@ -771,8 +771,6 @@ void RecognizableInstr::emitDecodePath(D<br>
VEX_WPrefix == X86Local::VEX_WIG, AddressSize);<br>
}<br>
<br>
- delete filter;<br>
-<br>
#undef MAP<br>
}<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div>