generate readable dumps

scripts/RV_Kcc/Shell.pm

@@ -11,12 +11,12 @@ use File::Spec::Functions qw(catfile);
 use String::ShellQuote qw(shell_quote_best_effort);
 use Exporter;
 
-use RV_Kcc::Files qw(tempFile kBinDir IS_CYGWIN);
+use RV_Kcc::Files qw(profileDir tempFile kBinDir IS_CYGWIN);
 
 use constant NULL => '/dev/null';
 
-use constant KBIN2TEXT         => do {
-	my $path = kBinDir('k-bin-to-text');
+use constant KAST         => do {
+	my $path = kBinDir('kast');
 	my $ext = IS_CYGWIN? '.bat' : '';
 	$path . $ext;
 };
@@ -30,6 +30,7 @@ our @EXPORT_OK = qw(
       enableDebugging
       saveArgv
       setShellDebugFile
+      setLanguageDefinition
       shell
       debug
 );
@@ -48,18 +49,24 @@ sub debug {
       }
 }
 
-sub shell {
-      my ($cmd, @args) = @_;
+sub shell_ex {
+      my ($out, $err, $cmd, @args) = @_;
       my $self =
             { CMD => $cmd
             , ARGS => \@args
-            , STDOUT => NULL
-            , STDERR => NULL
+            , STDOUT => $out
+            , STDERR => $err
             , TMP => ''
             };
       return (bless $self);
 }
 
+sub shell {
+      my ($cmd, @args) = @_;
+      return shell_ex(NULL, NULL, $cmd, @args)
+
+}
+
 sub verbose {
       my ($self) = @_;
       $self->{STDOUT} = '';
@@ -167,11 +174,20 @@ sub commandName {
             ($debugFile, $isBinary) = @_;
       }
 
+      my $languageDefinition;
+      sub setLanguageDefinition {
+            ($languageDefinition) = @_;
+      }
+
       sub checkError {
             my ($retval) = @_;
             if ($retval) {
                   if ($debugFile && $isBinary) {
-                        shell(KBIN2TEXT, $debugFile, 'kcc_config')->result();
+                        shell_ex('kcc_config', NULL, KAST,
+                          '-i', 'kore',
+                          '-o', 'pretty',
+                          '-d', $languageDefinition,
+                          $debugFile)->result();
                   } elsif ($debugFile) {
                         copy($debugFile, 'kcc_config');
                   }

scripts/kcc

@@ -20,7 +20,7 @@ use RV_Kcc::Opts qw(
       cppArgs suppressions ifdefs ldArgs nativeObjFiles srcFiles objFiles trampolineFiles breakpoints
       RVMAIN BASE_LIBS MAGIC
 );
-use RV_Kcc::Shell qw(shell checkError setShellDebugFile saveArgv debug);
+use RV_Kcc::Shell qw(shell checkError setShellDebugFile setLanguageDefinition saveArgv debug);
 
 # Here we trap control-c (and others) so we can clean up when that happens.
 $SIG{'ABRT'} = 'interruptHandler';
@@ -512,8 +512,8 @@ sub getTranslationCommand {
       my $cTransDef = profileDir("c-translation-kompiled");
       my $cppTransDef = profileDir("cpp-translation-kompiled");
 
-      my @krun = getKRunCommand($output,
-            $lang eq 'c++'? 'cpp-translation-kompiled' : 'c-translation-kompiled');
+      my $def = $lang eq 'c++'? 'cpp-translation-kompiled' : 'c-translation-kompiled';
+      my @krun = getKRunCommand($output, $def);
 
       if (arg('-ftranslation-depth=')) {
             push(@krun, '--depth');
@@ -533,6 +533,7 @@ sub getTranslationCommand {
       my $kast = parse($src, $lang, $trampolines);
       @krun = addArg("PGM", $kast, 'KItem', 'korefile', @krun);
 
+      setLanguageDefinition(profileDir($def));
       setShellDebugFile($output, 1);
       return @krun;
 }