@@ -58,7 +58,7 @@ TEST_F(TestPPC64InstEmulation, TestSimpleFunction) {
5858 UnwindAssemblyInstEmulation::CreateInstance (arch)));
5959 ASSERT_NE (nullptr , engine);
6060
61- UnwindPlan::RowSP row_sp ;
61+ const UnwindPlan::Row *row ;
6262 AddressRange sample_range;
6363 UnwindPlan unwind_plan (eRegisterKindLLDB);
6464 UnwindPlan::Row::AbstractRegisterLocation regloc;
@@ -96,76 +96,76 @@ TEST_F(TestPPC64InstEmulation, TestSimpleFunction) {
9696 sample_range, data, sizeof (data), unwind_plan));
9797
9898 // 0: CFA=sp+0
99- row_sp = unwind_plan.GetRowForFunctionOffset (0 );
100- EXPECT_EQ (0ull , row_sp ->GetOffset ());
101- EXPECT_TRUE (row_sp ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
102- EXPECT_TRUE (row_sp ->GetCFAValue ().IsRegisterPlusOffset () == true );
103- EXPECT_EQ (0 , row_sp ->GetCFAValue ().GetOffset ());
99+ row = unwind_plan.GetRowForFunctionOffset (0 );
100+ EXPECT_EQ (0ull , row ->GetOffset ());
101+ EXPECT_TRUE (row ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
102+ EXPECT_TRUE (row ->GetCFAValue ().IsRegisterPlusOffset () == true );
103+ EXPECT_EQ (0 , row ->GetCFAValue ().GetOffset ());
104104
105105 // 1: CFA=sp+0 => fp=[CFA-8]
106- row_sp = unwind_plan.GetRowForFunctionOffset (16 );
107- EXPECT_EQ (16ull , row_sp ->GetOffset ());
108- EXPECT_TRUE (row_sp ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
109- EXPECT_TRUE (row_sp ->GetCFAValue ().IsRegisterPlusOffset () == true );
110- EXPECT_EQ (0 , row_sp ->GetCFAValue ().GetOffset ());
106+ row = unwind_plan.GetRowForFunctionOffset (16 );
107+ EXPECT_EQ (16ull , row ->GetOffset ());
108+ EXPECT_TRUE (row ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
109+ EXPECT_TRUE (row ->GetCFAValue ().IsRegisterPlusOffset () == true );
110+ EXPECT_EQ (0 , row ->GetCFAValue ().GetOffset ());
111111
112- EXPECT_TRUE (row_sp ->GetRegisterInfo (gpr_r31_ppc64le, regloc));
112+ EXPECT_TRUE (row ->GetRegisterInfo (gpr_r31_ppc64le, regloc));
113113 EXPECT_TRUE (regloc.IsAtCFAPlusOffset ());
114114 EXPECT_EQ (-8 , regloc.GetOffset ());
115115
116116 // 2: CFA=sp+0 => fp=[CFA-8] lr=[CFA+16]
117- row_sp = unwind_plan.GetRowForFunctionOffset (20 );
118- EXPECT_EQ (20ull , row_sp ->GetOffset ());
119- EXPECT_TRUE (row_sp ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
120- EXPECT_TRUE (row_sp ->GetCFAValue ().IsRegisterPlusOffset () == true );
121- EXPECT_EQ (0 , row_sp ->GetCFAValue ().GetOffset ());
117+ row = unwind_plan.GetRowForFunctionOffset (20 );
118+ EXPECT_EQ (20ull , row ->GetOffset ());
119+ EXPECT_TRUE (row ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
120+ EXPECT_TRUE (row ->GetCFAValue ().IsRegisterPlusOffset () == true );
121+ EXPECT_EQ (0 , row ->GetCFAValue ().GetOffset ());
122122
123- EXPECT_TRUE (row_sp ->GetRegisterInfo (gpr_lr_ppc64le, regloc));
123+ EXPECT_TRUE (row ->GetRegisterInfo (gpr_lr_ppc64le, regloc));
124124 EXPECT_TRUE (regloc.IsAtCFAPlusOffset ());
125125 EXPECT_EQ (16 , regloc.GetOffset ());
126126
127127 // 3: CFA=sp+112 => fp=[CFA-8] lr=[CFA+16]
128- row_sp = unwind_plan.GetRowForFunctionOffset (24 );
129- EXPECT_EQ (24ull , row_sp ->GetOffset ());
130- EXPECT_TRUE (row_sp ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
131- EXPECT_TRUE (row_sp ->GetCFAValue ().IsRegisterPlusOffset () == true );
132- EXPECT_EQ (112 , row_sp ->GetCFAValue ().GetOffset ());
128+ row = unwind_plan.GetRowForFunctionOffset (24 );
129+ EXPECT_EQ (24ull , row ->GetOffset ());
130+ EXPECT_TRUE (row ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
131+ EXPECT_TRUE (row ->GetCFAValue ().IsRegisterPlusOffset () == true );
132+ EXPECT_EQ (112 , row ->GetCFAValue ().GetOffset ());
133133
134- EXPECT_TRUE (row_sp ->GetRegisterInfo (gpr_r31_ppc64le, regloc));
134+ EXPECT_TRUE (row ->GetRegisterInfo (gpr_r31_ppc64le, regloc));
135135 EXPECT_TRUE (regloc.IsAtCFAPlusOffset ());
136136 EXPECT_EQ (-8 , regloc.GetOffset ());
137137
138- EXPECT_TRUE (row_sp ->GetRegisterInfo (gpr_lr_ppc64le, regloc));
138+ EXPECT_TRUE (row ->GetRegisterInfo (gpr_lr_ppc64le, regloc));
139139 EXPECT_TRUE (regloc.IsAtCFAPlusOffset ());
140140 EXPECT_EQ (16 , regloc.GetOffset ());
141141
142142 // 4: CFA=r31+112 => fp=[CFA-8] lr=[CFA+16]
143- row_sp = unwind_plan.GetRowForFunctionOffset (28 );
144- EXPECT_EQ (28ull , row_sp ->GetOffset ());
145- EXPECT_TRUE (row_sp ->GetCFAValue ().GetRegisterNumber () == gpr_r31_ppc64le);
146- EXPECT_TRUE (row_sp ->GetCFAValue ().IsRegisterPlusOffset () == true );
147- EXPECT_EQ (112 , row_sp ->GetCFAValue ().GetOffset ());
143+ row = unwind_plan.GetRowForFunctionOffset (28 );
144+ EXPECT_EQ (28ull , row ->GetOffset ());
145+ EXPECT_TRUE (row ->GetCFAValue ().GetRegisterNumber () == gpr_r31_ppc64le);
146+ EXPECT_TRUE (row ->GetCFAValue ().IsRegisterPlusOffset () == true );
147+ EXPECT_EQ (112 , row ->GetCFAValue ().GetOffset ());
148148
149- EXPECT_TRUE (row_sp ->GetRegisterInfo (gpr_r31_ppc64le, regloc));
149+ EXPECT_TRUE (row ->GetRegisterInfo (gpr_r31_ppc64le, regloc));
150150 EXPECT_TRUE (regloc.IsAtCFAPlusOffset ());
151151 EXPECT_EQ (-8 , regloc.GetOffset ());
152152
153- EXPECT_TRUE (row_sp ->GetRegisterInfo (gpr_lr_ppc64le, regloc));
153+ EXPECT_TRUE (row ->GetRegisterInfo (gpr_lr_ppc64le, regloc));
154154 EXPECT_TRUE (regloc.IsAtCFAPlusOffset ());
155155 EXPECT_EQ (16 , regloc.GetOffset ());
156156
157157 // 5: CFA=sp+0 => fp=[CFA-8] lr=[CFA+16]
158- row_sp = unwind_plan.GetRowForFunctionOffset (40 );
159- EXPECT_EQ (40ull , row_sp ->GetOffset ());
160- EXPECT_TRUE (row_sp ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
161- EXPECT_TRUE (row_sp ->GetCFAValue ().IsRegisterPlusOffset () == true );
162- EXPECT_EQ (0 , row_sp ->GetCFAValue ().GetOffset ());
158+ row = unwind_plan.GetRowForFunctionOffset (40 );
159+ EXPECT_EQ (40ull , row ->GetOffset ());
160+ EXPECT_TRUE (row ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
161+ EXPECT_TRUE (row ->GetCFAValue ().IsRegisterPlusOffset () == true );
162+ EXPECT_EQ (0 , row ->GetCFAValue ().GetOffset ());
163163
164- EXPECT_TRUE (row_sp ->GetRegisterInfo (gpr_r31_ppc64le, regloc));
164+ EXPECT_TRUE (row ->GetRegisterInfo (gpr_r31_ppc64le, regloc));
165165 EXPECT_TRUE (regloc.IsAtCFAPlusOffset ());
166166 EXPECT_EQ (-8 , regloc.GetOffset ());
167167
168- EXPECT_TRUE (row_sp ->GetRegisterInfo (gpr_lr_ppc64le, regloc));
168+ EXPECT_TRUE (row ->GetRegisterInfo (gpr_lr_ppc64le, regloc));
169169 EXPECT_TRUE (regloc.IsAtCFAPlusOffset ());
170170 EXPECT_EQ (16 , regloc.GetOffset ());
171171}
@@ -177,7 +177,7 @@ TEST_F(TestPPC64InstEmulation, TestMediumFunction) {
177177 UnwindAssemblyInstEmulation::CreateInstance (arch)));
178178 ASSERT_NE (nullptr , engine);
179179
180- UnwindPlan::RowSP row_sp ;
180+ const UnwindPlan::Row *row ;
181181 AddressRange sample_range;
182182 UnwindPlan unwind_plan (eRegisterKindLLDB);
183183 UnwindPlan::Row::AbstractRegisterLocation regloc;
@@ -208,51 +208,51 @@ TEST_F(TestPPC64InstEmulation, TestMediumFunction) {
208208 sample_range, data, sizeof (data), unwind_plan));
209209
210210 // 0: CFA=sp+0
211- row_sp = unwind_plan.GetRowForFunctionOffset (0 );
212- EXPECT_EQ (0ull , row_sp ->GetOffset ());
213- EXPECT_TRUE (row_sp ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
214- EXPECT_TRUE (row_sp ->GetCFAValue ().IsRegisterPlusOffset () == true );
215- EXPECT_EQ (0 , row_sp ->GetCFAValue ().GetOffset ());
211+ row = unwind_plan.GetRowForFunctionOffset (0 );
212+ EXPECT_EQ (0ull , row ->GetOffset ());
213+ EXPECT_TRUE (row ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
214+ EXPECT_TRUE (row ->GetCFAValue ().IsRegisterPlusOffset () == true );
215+ EXPECT_EQ (0 , row ->GetCFAValue ().GetOffset ());
216216
217217 // 1: CFA=sp+0 => fp=[CFA-8]
218- row_sp = unwind_plan.GetRowForFunctionOffset (8 );
219- EXPECT_EQ (8ull , row_sp ->GetOffset ());
220- EXPECT_TRUE (row_sp ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
221- EXPECT_TRUE (row_sp ->GetCFAValue ().IsRegisterPlusOffset () == true );
222- EXPECT_EQ (0 , row_sp ->GetCFAValue ().GetOffset ());
218+ row = unwind_plan.GetRowForFunctionOffset (8 );
219+ EXPECT_EQ (8ull , row ->GetOffset ());
220+ EXPECT_TRUE (row ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
221+ EXPECT_TRUE (row ->GetCFAValue ().IsRegisterPlusOffset () == true );
222+ EXPECT_EQ (0 , row ->GetCFAValue ().GetOffset ());
223223
224- EXPECT_TRUE (row_sp ->GetRegisterInfo (gpr_r31_ppc64le, regloc));
224+ EXPECT_TRUE (row ->GetRegisterInfo (gpr_r31_ppc64le, regloc));
225225 EXPECT_TRUE (regloc.IsAtCFAPlusOffset ());
226226 EXPECT_EQ (-8 , regloc.GetOffset ());
227227
228228 // 2: CFA=sp+0 => fp=[CFA-8] lr=[CFA+16]
229- row_sp = unwind_plan.GetRowForFunctionOffset (12 );
230- EXPECT_EQ (12ull , row_sp ->GetOffset ());
231- EXPECT_TRUE (row_sp ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
232- EXPECT_TRUE (row_sp ->GetCFAValue ().IsRegisterPlusOffset () == true );
233- EXPECT_EQ (0 , row_sp ->GetCFAValue ().GetOffset ());
229+ row = unwind_plan.GetRowForFunctionOffset (12 );
230+ EXPECT_EQ (12ull , row ->GetOffset ());
231+ EXPECT_TRUE (row ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
232+ EXPECT_TRUE (row ->GetCFAValue ().IsRegisterPlusOffset () == true );
233+ EXPECT_EQ (0 , row ->GetCFAValue ().GetOffset ());
234234
235- EXPECT_TRUE (row_sp ->GetRegisterInfo (gpr_lr_ppc64le, regloc));
235+ EXPECT_TRUE (row ->GetRegisterInfo (gpr_lr_ppc64le, regloc));
236236 EXPECT_TRUE (regloc.IsAtCFAPlusOffset ());
237237 EXPECT_EQ (16 , regloc.GetOffset ());
238238
239239 // 3: CFA=r30
240- row_sp = unwind_plan.GetRowForFunctionOffset (16 );
241- EXPECT_EQ (16ull , row_sp ->GetOffset ());
242- EXPECT_TRUE (row_sp ->GetCFAValue ().GetRegisterNumber () == gpr_r30_ppc64le);
243- EXPECT_TRUE (row_sp ->GetCFAValue ().IsRegisterPlusOffset () == true );
244- EXPECT_EQ (0 , row_sp ->GetCFAValue ().GetOffset ());
245-
246- row_sp = unwind_plan.GetRowForFunctionOffset (32 );
247- EXPECT_EQ (16ull , row_sp ->GetOffset ());
248- EXPECT_TRUE (row_sp ->GetCFAValue ().GetRegisterNumber () == gpr_r30_ppc64le);
249- EXPECT_TRUE (row_sp ->GetCFAValue ().IsRegisterPlusOffset () == true );
250- EXPECT_EQ (0 , row_sp ->GetCFAValue ().GetOffset ());
240+ row = unwind_plan.GetRowForFunctionOffset (16 );
241+ EXPECT_EQ (16ull , row ->GetOffset ());
242+ EXPECT_TRUE (row ->GetCFAValue ().GetRegisterNumber () == gpr_r30_ppc64le);
243+ EXPECT_TRUE (row ->GetCFAValue ().IsRegisterPlusOffset () == true );
244+ EXPECT_EQ (0 , row ->GetCFAValue ().GetOffset ());
245+
246+ row = unwind_plan.GetRowForFunctionOffset (32 );
247+ EXPECT_EQ (16ull , row ->GetOffset ());
248+ EXPECT_TRUE (row ->GetCFAValue ().GetRegisterNumber () == gpr_r30_ppc64le);
249+ EXPECT_TRUE (row ->GetCFAValue ().IsRegisterPlusOffset () == true );
250+ EXPECT_EQ (0 , row ->GetCFAValue ().GetOffset ());
251251
252252 // 4: CFA=sp+0
253- row_sp = unwind_plan.GetRowForFunctionOffset (36 );
254- EXPECT_EQ (36ull , row_sp ->GetOffset ());
255- EXPECT_TRUE (row_sp ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
256- EXPECT_TRUE (row_sp ->GetCFAValue ().IsRegisterPlusOffset () == true );
257- EXPECT_EQ (0 , row_sp ->GetCFAValue ().GetOffset ());
253+ row = unwind_plan.GetRowForFunctionOffset (36 );
254+ EXPECT_EQ (36ull , row ->GetOffset ());
255+ EXPECT_TRUE (row ->GetCFAValue ().GetRegisterNumber () == gpr_r1_ppc64le);
256+ EXPECT_TRUE (row ->GetCFAValue ().IsRegisterPlusOffset () == true );
257+ EXPECT_EQ (0 , row ->GetCFAValue ().GetOffset ());
258258}
0 commit comments