@@ -227,7 +227,7 @@ class Plataforma {
227227 */
228228 cargarArchivoEnsamblador ( nom ) {
229229 let t = localStorage . getItem ( "archivo_" + nom ) || "" ;
230- t = buscarMacros ( t ) ;
230+ // t = buscarMacros(t);
231231 return t . split ( "\n" ) ;
232232 }
233233
@@ -361,7 +361,10 @@ class Plataforma {
361361 * @memberof Plataforma
362362 */
363363 escribirRegistro ( reg , val ) {
364- if ( val instanceof Array ) val = decodificarValor ( val , val . length , true , false ) ;
364+ if ( val instanceof Array ) {
365+ console . log ( "Array!" )
366+ val = decodificarValor ( val , val . length , true , false ) ;
367+ }
365368 reg = reg . toLowerCase ( ) ;
366369 switch ( reg ) {
367370 case "a" :
@@ -380,14 +383,14 @@ class Plataforma {
380383 case "ex" :
381384 case "hx" :
382385 case "lx" :
383- if ( val > 255 ) throw new ValorTamanoError ( val , 1 ) ;
386+ if ( val > 255 ) throw new ValorTamanoError ( 2 ) ;
384387 document . getElementById ( "v-" + reg ) . textContent = val . toString ( 16 ) . toUpperCase ( ) . padStart ( 2 , "0" ) ;
385388 break ;
386389 case "ix" :
387390 case "iy" :
388391 case "sp" :
389392 case "pc" :
390- if ( val > 65535 ) throw new ValorTamanoError ( val , 1 ) ;
393+ if ( val > 65535 ) throw new ValorTamanoError ( 2 ) ;
391394 document . getElementById ( "v-" + reg ) . textContent = val . toString ( 16 ) . toUpperCase ( ) . padStart ( 4 , "0" ) ;
392395 break ;
393396 case "bc" :
@@ -396,14 +399,15 @@ class Plataforma {
396399 case "bcx" :
397400 case "dex" :
398401 case "hlx" :
399- if ( val > 65535 ) throw new ValorTamanoError ( val , 1 ) ;
402+ if ( val > 65535 ) throw new ValorTamanoError ( 2 ) ;
400403 let va = val . toString ( 16 ) . padStart ( 4 , "0" ) . substring ( 0 , 2 ) ;
401404 let vb = val . toString ( 16 ) . padStart ( 4 , "0" ) . substring ( 2 , 4 ) ;
402- document . getElementById ( "v-" + reg [ 0 ] + ( ( reg . length == 3 ) ?"x" :"" ) ) . textContent = vb ;
403- document . getElementById ( "v-" + reg [ 1 ] + ( ( reg . length == 3 ) ?"x" :"" ) ) . textContent = va ;
405+ document . getElementById ( "v-" + reg [ 0 ] + ( ( reg . length == 3 ) ?"x" :"" ) ) . textContent = va ;
406+ document . getElementById ( "v-" + reg [ 1 ] + ( ( reg . length == 3 ) ?"x" :"" ) ) . textContent = vb ;
407+ break ;
404408 case "f" :
405409 case "fx" :
406- if ( val > 255 ) throw new ValorTamanoError ( val , 1 ) ;
410+ if ( val > 255 ) throw new ValorTamanoError ( 1 ) ;
407411 Array . from ( val . toString ( 2 ) . padStart ( 8 , "0" ) ) . forEach ( ( e , i ) => {
408412 let it = document . querySelector ( "#r-f tr:nth-child(" + ( i + 2 ) + ") td:nth-child(" + ( ( reg == "f" ) ?2 :4 ) + ")" ) ;
409413 if ( e == "1" ) it . classList . add ( "activo" ) ;
@@ -911,26 +915,25 @@ class Plataforma {
911915 } ] ] ;
912916 case 0xf :
913917 this . escribirRegistro ( "pc" , dir + 1 ) ;
914-
915918 op1 = this . leerRegistro ( "a" ) ;
916919 auxv1 = Plataforma . obtRRC ( op1 ) ;
917920 this . escribirRegistro ( "a" , auxv1 [ 0 ] ) ;
918921 this . estBanderasOp ( "RRCA" , auxv1 ) ;
919922 return [ "RRCA" , 4 , 1 , 1 , [ ] ] ;
920923 case 0x10 :
921- //op1 = decodificarValor([this.leerMemoria(dir+1)], 1, true, true);
922- op1 = this . leerMemoria ( dir + 1 ) ;
924+ op1 = decodificarValor ( [ this . leerMemoria ( dir + 1 ) ] , 1 , true , true ) ;
923925 auxv1 = this . leerRegistro ( "b" ) ;
924- if ( auxv1 > 0 ) {
925- this . escribirRegistro ( "b" , auxv1 - 1 ) ;
926+ this . escribirRegistro ( "b" , auxv1 - 1 ) ;
927+ if ( auxv1 - 1 > 0 ) {
926928 this . escribirRegistro ( "pc" , dir + op1 + 2 ) ;
927929 tt = 13 ;
928930 tm = 3 ;
929931 } else {
932+ this . escribirRegistro ( "pc" , dir + 2 ) ;
930933 tt = 8 ;
931934 tm = 2 ;
932935 }
933- return [ "DJNZ" , tt , tm , [ {
936+ return [ "DJNZ" , tt , tm , 2 , [ {
934937 "tipo" : TipoOpEns . DESPLAZAMIENTO ,
935938 "texto" : this . imprimirValor ( TipoOpEns . DESPLAZAMIENTO , op1 + 2 )
936939 } ] ] ;
@@ -1062,7 +1065,7 @@ class Plataforma {
10621065 "texto" : "HL"
10631066 } , {
10641067 "tipo" : TipoOpEns . DIRECCION ,
1065- "texto" : this . imprimirValor ( TipoOpEns . DIRECCION , dir1 )
1068+ "texto" : this . imprimirValor ( TipoOpEns . DIRECCION , dir2 )
10661069 } ] ] ;
10671070 case 0x2f :
10681071 this . escribirRegistro ( "pc" , dir + 1 ) ;
@@ -1128,8 +1131,8 @@ class Plataforma {
11281131 dir2 = this . leerRegistro ( "hl" ) ;
11291132 op2 = this . escribirMemoria ( dir2 , op1 ) ;
11301133 return [ "LD" , 10 , 3 , 2 , [ {
1131- "tipo" : TipoOpEns . DESPLAZAMIENTO ,
1132- "texto" : "(HL" + this . imprimirValor ( TipoOpEns . DESPLAZAMIENTO , op1 ) + " )"
1134+ "tipo" : TipoOpEns . DIRECCION_R ,
1135+ "texto" : "(HL)"
11331136 } , {
11341137 "tipo" : TipoOpEns . NUMERO ,
11351138 "texto" : this . imprimirValor ( TipoOpEns . NUMERO , op2 )
@@ -1501,15 +1504,16 @@ class Plataforma {
15011504 /* Compuestos */
15021505 /** 00dd0001 **/
15031506 case 1 : case 17 : case 33 : case 49 :
1507+ this . escribirRegistro ( "pc" , dir + 3 ) ;
15041508 dir1 = ( cod - 1 ) >> 4 ;
15051509 op2 = this . leerPalabra ( dir + 1 ) ;
15061510 this . escribirRegistro ( this . ValsSS [ dir1 ] , op2 ) ;
15071511 return [ "LD" , 10 , 2 , 1 , [ {
15081512 "tipo" : TipoOpEns . REGISTRO ,
15091513 "texto" : this . ValsSS [ dir1 ]
15101514 } , {
1511- "tipo" : TipoOpEns . DIRECCION ,
1512- "texto" : this . imprimirValor ( TipoOpEns . DIRECCION , op2 )
1515+ "tipo" : TipoOpEns . NUMERO ,
1516+ "texto" : this . imprimirValor ( TipoOpEns . NUMERO , op2 )
15131517 } ] ] ;
15141518 /** 00rrr100 **/
15151519 case 4 : case 12 : case 20 : case 28 : case 36 : case 44 : case 60 :
@@ -1558,12 +1562,12 @@ class Plataforma {
15581562 } ] ] ;
15591563 /** 00ss1001 **/
15601564 case 9 : case 25 : case 41 : case 57 :
1561- this . escribirRegistro ( "pc" , dir + 2 ) ;
1565+ this . escribirRegistro ( "pc" , dir + 1 ) ;
15621566 dir2 = ( cod - 3 ) >> 4 ;
15631567 op1 = this . leerRegistro ( "hl" ) ;
15641568 op2 = this . leerRegistro ( this . ValsSS [ dir2 ] ) ;
1565- res = op1 + op2 ;
1566- this . escribirRegistro ( this . ValsSS [ dir2 ] , res ) ;
1569+ res = op1 + op2 ;
1570+ this . escribirRegistro ( "hl" , res ) ;
15671571 this . estBanderasOp ( "ADD" , [ res , op1 , op2 ] ) ;
15681572 return [ "ADD" , 11 , 3 , 1 , [ {
15691573 "tipo" : TipoOpEns . REGISTRO_PAR ,
@@ -1798,6 +1802,7 @@ class Plataforma {
17981802 } ] ] ;
17991803 /** 11qq0001 **/
18001804 case 193 : case 209 : case 225 : case 241 :
1805+ this . escribirRegistro ( "pc" , dir + 1 ) ;
18011806 dir1 = ( cod - 193 ) >> 4 ;
18021807 op1 = this . leerPila ( ) ;
18031808 this . retirarPila ( ) ;
@@ -1808,6 +1813,7 @@ class Plataforma {
18081813 } ] ] ;
18091814 /** 11qq0101 **/
18101815 case 197 : case 213 : case 229 : case 245 :
1816+ this . escribirRegistro ( "pc" , dir + 1 ) ;
18111817 dir1 = ( cod - 197 ) >> 4 ;
18121818 op1 = this . leerRegistro ( this . ValsQQ [ dir1 ] ) ;
18131819 this . insertarPila ( op1 ) ;
0 commit comments