Changeset 44aad8f for libcfa/src/iostream.cfa

Timestamp:

Apr 27, 2020, 4:36:58 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c59a346

Parents:

038be32 (diff), c680a4b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/iostream.cfa (modified) (3 diffs)

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr 22 10:50:46 2020
-// Update Count     : 933
+// Last Modified On : Sun Apr 26 20:31:36 2020
+// Update Count     : 985
 //
 
@@ -565 +565 @@
                                 fmt2.flags.pad0 = fmt2.flags.nobsdp = true;     \
                                 if ( f.base == 'b' | f.base == 'B' ) { \
-                                        if ( fmt.flags.pc && fmt.pc > 64 ) fmt.pc -= 64; \
+                                        if ( fmt.flags.pc && fmt.pc > 64 ) fmt.pc -= 64; else { fmt.flags.pc = false; fmt.pc = 0; } \
                                         if ( fmt.flags.left ) { \
                                                 fmt2.wd = fmt.wd; \
@@ -584 +584 @@
                                                 printf( "left %d %d %x\n", fmt.wd, fmt.pc, fmt.all ); \
                                         } else { \
+                                                if ( fmt.wd > 64 ) fmt.wd -= 64; \
+                                                /* if ( ! fmt.flags.nobsdp && fmt.pc < fmt.wd ) fmt.wd -= 1; */ \
                                                 fmt2.wd = 64; \
-                                                if ( fmt.wd > 64 ) fmt.wd -= 64; \
-                                                printf( "left %d %d %x\n", f.wd, f.pc, f.all ); \
-                                                printf( "left %d %d %x\n", fmt.wd, fmt.pc, fmt.all ); \
+                                                /* printf( "R %llo %llo %llo %llo %d %d '%c' %x\n", msig, lsig, fmt.val, fmt2.val, fmt.wd, fmt.pc, fmt.base, fmt.all ); */ \
                                         } /* if */ \
-                                        fmt2.pc = 64; fmt2.flags.pc = true;     \
-                                        printf( "left %d %d %x\n", fmt2.wd, fmt2.pc, fmt2.all ); \
+                                        /* printf( "\nC %llo %d %d '%c' %x\n", fmt2.val, fmt2.wd, fmt2.pc, fmt2.base, fmt2.all ); */ \
                                         (ostype &)(os | fmt | "" | fmt2); \
                                 } else if ( f.base == 'o' ) { \
-                                        if ( fmt.flags.pc && fmt.pc > 21 ) fmt.pc -= 21; \
+                                        if ( fmt.flags.pc && fmt.pc > 22 ) fmt.pc -= 22; else { fmt.flags.pc = false; fmt.pc = 0; } \
+                                        fmt.val = (unsigned long long int)fmt.val >> 2; \
+                                        fmt2.val = ((msig & 0x3) << 1) + ((lsig & 0x8000000000000000U) != 0); \
                                         if ( fmt.flags.left ) { \
                                                 fmt.flags.left = false; \
-                                                fmt.wd = 1; \
-                                                fmt.val = (unsigned long long int)fmt.val >> 2; \
-                                                fmt2.wd = 1; \
-                                                fmt2.val = ((msig & 0x3) << 1) + 1; \
+                                                fmt.wd = 0; \
+                                                /* if ( fmt2.val > 1 && fmt.flags.pc && fmt.pc > 0 ) fmt.pc -= 1; */ \
+                                                /* printf( "L %llo %llo %llo %llo %d %d '%c' %x\n", msig, lsig, fmt.val, fmt2.val, fmt.wd, fmt.pc, fmt.base, fmt.all ); */ \
                                                 (ostype &)(os | fmt | "" | fmt2); \
                                                 sepOff( os ); \
                                                 fmt2.flags.left = true; \
-                                                fmt2.wd = f.wd - ( ceiling( high1( fmt.val ), 3 ) + 1 ); \
+                                                int msigd = ceiling( high1( fmt.val ), 3 ) + 1; \
+                                                fmt2.wd = f.wd - (fmt.pc > msigd ? fmt.pc : msigd) - 1; \
+                                                if ( fmt2.wd < 21 ) fmt2.wd = 21; \
                                                 fmt2.flags.pc = true; fmt2.pc = 21; \
-                                                if ( ! fmt.flags.nobsdp ) { fmt2.wd -= 1; } \
-                                                fmt2.val = lsig & 0x7fffffffffffffff; \
-                                                (ostype &)(os | fmt2); \
                                         } else { \
-                                                fmt.val = (unsigned long long int)fmt.val >> 2; \
-                                                if ( fmt.wd > 21 ) fmt.wd -= 21; \
-                                                if ( ! fmt.flags.nobsdp ) { if ( fmt.pc < fmt.wd ) fmt.wd -= 1; else fmt.pc -= 1; } \
+                                                if ( fmt.wd > 22 ) fmt.wd -= 22; \
+                                                /* compensate for leading 0 */ \
+                                                /*if ( ! fmt.flags.nobsdp && fmt.pc < fmt.wd ) fmt.wd -= 1;*/ \
                                                 fmt2.wd = 1; \
-                                                fmt2.val = ((msig & 0x3) << 1) + 1; \
+                                                /* printf( "R %llo %llo %llo %llo %d %d '%c' %x\n", msig, lsig, fmt.val, fmt2.val, fmt.wd, fmt.pc, fmt.base, fmt.all ); */ \
                                                 (ostype &)(os | fmt | "" | fmt2); \
                                                 sepOff( os ); \
                                                 fmt2.wd = 21; \
-                                                fmt2.val = lsig & 0x7fffffffffffffff; \
-                                                (ostype &)(os | fmt2); \
                                         } /* if */ \
+                                        fmt2.val = lsig & 0x7fffffffffffffffU; \
+                                        /* printf( "\nC %llo %d %d '%c' %x\n", fmt2.val, fmt2.wd, fmt2.pc, fmt2.base, fmt2.all ); */ \
+                                        (ostype &)(os | fmt2); \
                                 } else { \
                                         if ( fmt.flags.pc && fmt.pc > 16 ) fmt.pc -= 16; \