Changeset 649 for trunk

Timestamp:

Oct 22, 2019, 3:28:59 PM (4 years ago)

Author:

alain

Message:

update build_disk command in Makefile

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• user/fft/fft.c (modified) (1 diff)

trunk/Makefile

@@ -129 +129 @@
         dd              if=$(DISK_IMAGE) of=temp.dmg count=65536
         mv              temp.dmg $(DISK_IMAGE)
-        mmd             -o -i $(DISK_IMAGE) ::/bin                          || true
-        mmd             -o -i $(DISK_IMAGE) ::/bin/kernel                   || true
-        mmd             -o -i $(DISK_IMAGE) ::/bin/user                     || true
-        mmd             -o -i $(DISK_IMAGE) ::/home                         || true
-        mmd             -o -i $(DISK_IMAGE) ::/misc                         || true 
-        mcopy           -o -i $(DISK_IMAGE) images/lena_256.raw ::/misc     || true             
-        mcopy           -o -i $(DISK_IMAGE) images/images_128.raw ::/misc   || true             
-        mcopy           -o -i $(DISK_IMAGE) images/philips_1024.raw ::/misc || true             
+        mmd             -o -i $(DISK_IMAGE) ::/bin                            || true
+        mmd             -o -i $(DISK_IMAGE) ::/bin/kernel                     || true
+        mmd             -o -i $(DISK_IMAGE) ::/bin/user                       || true
+        mmd             -o -i $(DISK_IMAGE) ::/home                           || true
+        mmd             -o -i $(DISK_IMAGE) ::/misc                           || true 
+        mcopy           -o -i $(DISK_IMAGE) images/lena_256.raw ::/misc       || true             
+        mcopy           -o -i $(DISK_IMAGE) images/images_128.raw ::/misc     || true             
+        mcopy           -o -i $(DISK_IMAGE) images/philips_1024_2.raw ::/misc || true             
         mdir                -/ -b -i $(DISK_IMAGE) ::/
 
@@ -143 +143 @@
 # arch_info.bin and arch_info.xml), and update the virtual disk.
 hard_config.h: $(ARCH)/arch_info.py
-        tools/arch_info/genarch.py      --arch=$(ARCH)          \
-                                        --x_size=$(X_SIZE)      \
-                                        --y_size=$(Y_SIZE)      \
-                                        --nb_cores=$(NB_PROCS)  \
-                                        --nb_ttys=$(NB_TTYS)    \
-                                        --ioc_type=$(IOC_TYPE)  \
-                                        --txt_type=$(TXT_TYPE)  \
-                                        --fbf_type=$(FBF_TYPE)  \
-                                        --sys_clk=$(SYS_CLK)    \
-                                        --hard=.                \
-                                        --bin=.                 \
+        tools/arch_info/genarch.py      --arch=$(ARCH)  \
+                                        --x_size=$(X_SIZE)              \
+                                        --y_size=$(Y_SIZE)              \
+                                        --nb_cores=$(NB_PROCS)      \
+                                        --nb_ttys=$(NB_TTYS)        \
+                                        --ioc_type=$(IOC_TYPE)      \
+                    --txt_type=$(TXT_TYPE)      \
+                    --fbf_type=$(FBF_TYPE)      \
+                    --sys_clk=$(SYS_CLK)        \
+                                        --hard=.                            \
+                                        --bin=.                             \
                                         --xml=.                                 
         mcopy -o -i $(DISK_IMAGE) arch_info.bin ::/   || true

trunk/user/fft/fft.c

@@ -488 +488 @@
         if (parallel_time[tid] > time_para)    time_para      = parallel_time[tid];
         if (sync_time[tid]     > time_sync)    time_sync      = sync_time[tid];
-                                               pgfaults_nr   += pgfault_nr[tid];
-                                               pgfaults_cost += pgfault_cost[tid];
+
+        pgfaults_nr   += pgfault_nr[tid];
+        pgfaults_cost += pgfault_cost[tid];
+
         if (pgfault_max[tid]   > pgfaults_max) pgfaults_max   = pgfault_max[tid];
     }