nagra: improve map register debug

diff --git a/systems/nagra/nagra2.c b/systems/nagra/nagra2.c
index 24c8c194dabd89aca40b85c34bae1ce4e287f6f0..70309785143ef3ed808a6388c2b3ecc8d40a0dbf 100644 (file)
--- a/systems/nagra/nagra2.c
+++ b/systems/nagra/nagra2.c
@@ -260,9 +260,9 @@ bool cN2Emu::Init(int id, int romv)
 
 // -- cMapReg ------------------------------------------------------------------
 
-cMapReg::cMapReg(const int *Ws)
+cMapReg::cMapReg(const int *Ws, const char *Name)
 {
-  ws=Ws;
+  ws=Ws; name=Name;
 }
 
 void cMapReg::Save(int size)
@@ -273,9 +273,9 @@ void cMapReg::Save(int size)
     BN_mask_bits(reg,size<<6);
     touched=true;
 #ifdef MR_DEBUG
-fprintf(stderr,"saved %p size=%d\n",this,size);
-BN_print_fp(stderr,reg); fprintf(stderr,"\n");
-BN_print_fp(stderr,save); fprintf(stderr,"\n");
+fprintf(stderr,"saved %s size=%d\n",name,size);
+fprintf(stderr,"reg : "); BN_print_fp(stderr,reg); fprintf(stderr,"\n");
+fprintf(stderr,"save: "); BN_print_fp(stderr,save); fprintf(stderr,"\n");
 #endif
     }
 }
@@ -285,9 +285,9 @@ void cMapReg::Restore(int size)
   if(touched && ws) {
     if(size<=0) size=*ws;
 #ifdef MR_DEBUG
-fprintf(stderr,"restore %p size=%d\n",this,size);
-BN_print_fp(stderr,reg); fprintf(stderr,"\n");
-BN_print_fp(stderr,save); fprintf(stderr,"\n");
+fprintf(stderr,"restore %s size=%d\n",name,size);
+fprintf(stderr,"reg : "); BN_print_fp(stderr,reg); fprintf(stderr,"\n");
+fprintf(stderr,"save: "); BN_print_fp(stderr,save); fprintf(stderr,"\n");
 #endif
     if(reg->neg) {
       BN_zero(tmp);
@@ -300,7 +300,7 @@ BN_print_fp(stderr,save); fprintf(stderr,"\n");
     BN_add(reg,reg,tmp);
     touched=false;
 #ifdef MR_DEBUG
-BN_print_fp(stderr,reg); fprintf(stderr,"\n");
+fprintf(stderr,"reg : "); BN_print_fp(stderr,reg); fprintf(stderr,"\n");
 #endif
     }
 }
@@ -310,7 +310,7 @@ BN_print_fp(stderr,reg); fprintf(stderr,"\n");
 const int cMapMath::ws1=1;
 
 cMapMath::cMapMath(void)
-:A(&wordsize),B(&wordsize),C(&wordsize),D(&wordsize),J(&ws1),I(0)
+:A(&wordsize,"A"),B(&wordsize,"B"),C(&wordsize,"C"),D(&wordsize,"D"),J(&ws1,"J"),I(0,"I")
 {
   wordsize=DEF_WORDSIZE;
 }

diff --git a/systems/nagra/nagra2.h b/systems/nagra/nagra2.h
index 30889aaed4167db8943f3e03e67b35cc9a9dd506..28436112884fb723234ea2a389aad0fff12df244 100644 (file)
--- a/systems/nagra/nagra2.h
+++ b/systems/nagra/nagra2.h
@@ -50,15 +50,16 @@ extern char auxPassword[250];
 
 // ----------------------------------------------------------------
 
-//#define MR_DEBUG
+#define MR_DEBUG
 
 class cMapReg {
 private:
   cBN reg, save, tmp;
   const int *ws;
+  const char *name;
   bool touched;
 public:
-  cMapReg(const int *Ws);
+  cMapReg(const int *Ws, const char *Name);
   operator BIGNUM* () { Save(); return reg.BN(); }
   BIGNUM *operator->() { Save(); return reg.BN(); }
   bool Get(const unsigned char *in, int n) { Save(); return reg.Get(in,n); }