@@ -144,35 +144,35 @@ impl CPU {
144144 }
145145 }
146146
147- fn inc_r8 ( & mut self , reg : Register8bit ) {
148- let register = self . registers . as_8bit ( & reg ) ;
149- if register == 0xFF {
150- self . registers . set ( reg , 0x00 ) ;
147+ fn inc_r8 ( & mut self , register : Register8bit ) {
148+ let data = self . registers . as_8bit ( & register ) ;
149+ if data == 0xFF {
150+ self . registers . set ( register , 0x00 ) ;
151151 self . registers
152152 . set_flags ( Some ( true ) , Some ( false ) , Some ( true ) , None ) ;
153153 } else {
154- self . registers . set ( reg , register + 1 ) ;
154+ self . registers . set ( register , data + 1 ) ;
155155 self . registers . set_flags ( None , Some ( false ) , None , None ) ;
156156 } ;
157157 self . clock . cycles += 1 ;
158158 }
159159
160- fn dec_r8 ( & mut self , reg : Register8bit ) {
161- let register = self . registers . as_8bit ( & reg ) ;
162- if register == 0x00 {
163- self . registers . set ( reg , 0xFF ) ;
160+ fn dec_r8 ( & mut self , register : Register8bit ) {
161+ let data = self . registers . as_8bit ( & register ) ;
162+ if data == 0x00 {
163+ self . registers . set ( register , 0xFF ) ;
164164 self . registers
165165 . set_flags ( Some ( true ) , Some ( false ) , Some ( true ) , None ) ;
166166 } else {
167- self . registers . set ( reg , register - 1 ) ;
167+ self . registers . set ( register , data - 1 ) ;
168168 self . registers . set_flags ( None , Some ( false ) , None , None ) ;
169169 } ;
170170 self . clock . cycles += 1 ;
171171 }
172172
173- fn load_r8_n8 ( & mut self , reg : Register8bit ) {
173+ fn load_r8_n8 ( & mut self , register : Register8bit ) {
174174 let data = CPU :: fetch ( & mut self . registers . pc , & self . memory ) ;
175- self . registers . set ( reg , data) ;
175+ self . registers . set ( register , data) ;
176176 self . clock . cycles += 2 ;
177177 }
178178
@@ -182,22 +182,22 @@ impl CPU {
182182 self . clock . cycles += 2 ;
183183 }
184184
185- fn load_r16_n16 ( & mut self , reg : Register16bit ) {
185+ fn load_r16_n16 ( & mut self , register : Register16bit ) {
186186 let lsb = CPU :: fetch ( & mut self . registers . pc , & self . memory ) ;
187187 let msb = CPU :: fetch ( & mut self . registers . pc , & self . memory ) ;
188- self . registers . set_16bit ( reg , msb, lsb) ;
188+ self . registers . set_16bit ( register , msb, lsb) ;
189189 self . clock . cycles += 3 ;
190190 }
191191
192- fn load_r16_a ( & mut self , address : Register16bit ) {
193- let address = self . registers . as_16bit ( & address ) ;
192+ fn load_r16_a ( & mut self , register : Register16bit ) {
193+ let address = self . registers . as_16bit ( & register ) ;
194194 let data = self . registers . as_8bit ( & Register8bit :: A ) ;
195195 self . memory . write ( address, data) ;
196196 self . clock . cycles += 2 ;
197197 }
198198
199- fn load_a_r16 ( & mut self , address : Register16bit ) {
200- let address = self . registers . as_16bit ( & address ) ;
199+ fn load_a_r16 ( & mut self , register : Register16bit ) {
200+ let address = self . registers . as_16bit ( & register ) ;
201201 let data = self . memory . read ( address) ;
202202 self . registers . set ( Register8bit :: A , data) ;
203203 self . clock . cycles += 2 ;
0 commit comments