![(please configure the [header_logo] section in trac.ini)](/trac/giet-vm/chrome/site/your_project_logo.png){kind=logo}
Changeset 581
- Timestamp:
- Jun 4, 2015, 1:13:29 PM (9 years ago)
- Location:
- soft/giet_vm
- Files:
-
- 49 added
- 1 deleted
- 2 edited
-
Makefile (modified) (15 diffs)
-
applications/ocean (added)
-
applications/ocean/Makefile (added)
-
applications/ocean/Makefile.config.giet (added)
-
applications/ocean/Makefile.config.natif (added)
-
applications/ocean/Makefile.giet (added)
-
applications/ocean/Makefile.natif (added)
-
applications/ocean/README.ocean (added)
-
applications/ocean/decs.H (added)
-
applications/ocean/giet_utils.C (added)
-
applications/ocean/giet_utils.H (added)
-
applications/ocean/global.C (added)
-
applications/ocean/jacobcalc.C (added)
-
applications/ocean/jacobcalc2.C (added)
-
applications/ocean/laplacalc.C (added)
-
applications/ocean/linkup.C (added)
-
applications/ocean/main.C (added)
-
applications/ocean/multi.C (added)
-
applications/ocean/null_macros (added)
-
applications/ocean/null_macros/c.m4.null (added)
-
applications/ocean/null_macros/c.m4.null.GIET (added)
-
applications/ocean/null_macros/c.m4.null.POSIX (added)
-
applications/ocean/null_macros/c.m4.null.POSIX_BARRIER (added)
-
applications/ocean/null_macros/c.m4.null.SOCLIB (added)
-
applications/ocean/ocean (added)
-
applications/ocean/ocean.ld (added)
-
applications/ocean/ocean.py (added)
-
applications/ocean/slave1.C (added)
-
applications/ocean/slave2.C (added)
-
applications/ocean/subblock.C (added)
-
build (deleted)
-
giet_libs/math (added)
-
giet_libs/math.h (added)
-
giet_libs/math/e_pow.c (added)
-
giet_libs/math/e_rem_pio2.c (added)
-
giet_libs/math/e_sqrt.c (added)
-
giet_libs/math/k_cos.c (added)
-
giet_libs/math/k_rem_pio2.c (added)
-
giet_libs/math/k_sin.c (added)
-
giet_libs/math/math_private.h (added)
-
giet_libs/math/s_copysign.c (added)
-
giet_libs/math/s_fabs.c (added)
-
giet_libs/math/s_finite.c (added)
-
giet_libs/math/s_floor.c (added)
-
giet_libs/math/s_isnan.c (added)
-
giet_libs/math/s_rint.c (added)
-
giet_libs/math/s_scalbn.c (added)
-
giet_libs/math/s_sin.c (added)
-
giet_libs/math/sqrt.c (added)
-
giet_libs/stdio.c (modified) (1 diff)
-
giet_libs/user_sqt_lock.c (added)
-
giet_libs/user_sqt_lock.h (added)
Legend:
- Unmodified
- Added
- Removed
-
soft/giet_vm/Makefile
r580 r581 11 11 #ARCH ?= ../tsar-trunk-svn-2013/platforms/tsar_generic_iob 12 12 ARCH ?= ../../../tsar/platforms/tsar_generic_iob 13 X_SIZE ?= 214 Y_SIZE ?= 213 X_SIZE ?= 1 14 Y_SIZE ?= 1 15 15 NB_PROCS ?= 4 16 16 NB_TTYS ?= 1 … … 20 20 21 21 22 .PHONY: map.bin build clean22 .PHONY: clean map.bin build 23 23 24 24 ### FAT parameters definition for Disk image … … 244 244 mcopy -o -i $(DISK_IMAGE) applications/transpose/images.raw ::/misc 245 245 mcopy -o -i $(DISK_IMAGE) applications/convol/philips_image.raw ::/misc 246 mcopy -o -i $(DISK_IMAGE) applications/display/lena.raw ::/misc 246 247 mcopy -o -i $(DISK_IMAGE) map.bin ::/ 247 248 ### Copy bootloader into sector 2 of disk image … … 268 269 mmd -o -i $(DISK_IMAGE) ::/misc 269 270 mmd -o -i $(DISK_IMAGE) ::/home 270 mcopy -o -i $(DISK_IMAGE) applications/transpose/images.raw ::/misc271 mcopy -o -i $(DISK_IMAGE) applications/convol/philips_image.raw ::/misc272 mcopy -o -i $(DISK_IMAGE) applications/display/lena.raw ::/misc271 # mcopy -o -i $(DISK_IMAGE) applications/transpose/images.raw ::/misc 272 # mcopy -o -i $(DISK_IMAGE) applications/convol/philips_image.raw ::/misc 273 # mcopy -o -i $(DISK_IMAGE) applications/display/lena.raw ::/misc 273 274 274 275 ### mapping generation: map.bin / map.xml / hard_config.h / giet_vsegs.ld 275 map.bin hard_config.h giet_vsegs.ld: $(ARCH)/arch.py applications/$(APP)/$(APP).py 276 map.bin hard_config.h giet_vsegs.ld: $(ARCH)/arch.py applications/$(APP)/$(APP).py $(DISK_IMAGE) 276 277 giet_python/genmap --arch=$(ARCH) \ 277 278 --x=$(X_SIZE) \ … … 284 285 --$(APP) \ 285 286 --xml=. 286 mcopy -o -i $(DISK_IMAGE) map.bin ::/287 # mcopy -o -i $(DISK_IMAGE) map.bin ::/ 287 288 288 289 ### drivers compilation … … 435 436 ### boot compilation 436 437 ### Copy bootloader into sector 2 of disk image 437 build/boot:438 mkdir $@439 438 440 439 build/boot/boot.elf: $(BOOT_OBJS) \ 440 $(DISK_IMAGE) \ 441 441 giet_boot/boot.ld \ 442 442 build/drivers/libdrivers.a | build/boot … … 460 460 ### kernel compilation 461 461 build/kernel/kernel.elf: $(KERNEL_OBJS) \ 462 $(DISK_IMAGE) \ 462 463 giet_kernel/kernel.ld \ 463 464 build/drivers/libdrivers.a … … 465 466 $(DU) -D $@ > $@.txt 466 467 mmd -o -i $(DISK_IMAGE) ::/build/kernel || true 467 mcopy -o -i $(DISK_IMAGE) $@ ::/build/kernel468 # mcopy -o -i $(DISK_IMAGE) $@ ::/build/kernel 468 469 469 470 build/kernel/%.o: giet_kernel/%.c \ … … 536 537 ######################################## 537 538 ### display application compilation 538 build/display/display.elf: $(DISPLAY_OBJS) applications/display/display.ld hard_config.h 539 build/display/display.elf: $(DISPLAY_OBJS) applications/display/display.ld hard_config.h $(DISK_IMAGE) 539 540 $(LD) -o $@ -T applications/display/display.ld $(DISPLAY_OBJS) 540 541 $(DU) -D $@ > $@.txt 541 542 mmd -o -i $(DISK_IMAGE) ::/build/display || true 542 mcopy -o -i $(DISK_IMAGE) $@ ::/build/display543 # mcopy -o -i $(DISK_IMAGE) $@ ::/build/display 543 544 544 545 build/display/main.o: applications/display/main.c hard_config.h … … 547 548 ######################################## 548 549 ### router compilation 549 build/router/router.elf: $(ROUTER_OBJS) applications/router/router.ld hard_config.h 550 build/router/router.elf: $(ROUTER_OBJS) applications/router/router.ld hard_config.h $(DISK_IMAGE) 550 551 $(LD) -o $@ -T applications/router/router.ld $(ROUTER_OBJS) 551 552 $(DU) -D $@ > $@.txt 552 553 mmd -o -i $(DISK_IMAGE) ::/build/router || true 553 mcopy -o -i $(DISK_IMAGE) $@ ::/build/router554 # mcopy -o -i $(DISK_IMAGE) $@ ::/build/router 554 555 555 556 build/router/main.o: applications/router/main.c hard_config.h … … 558 559 ######################################## 559 560 ### hello compilation 560 build/hello/hello.elf: $(HELLO_OBJS) applications/hello/hello.ld hard_config.h 561 build/hello/hello.elf: $(HELLO_OBJS) applications/hello/hello.ld hard_config.h $(DISK_IMAGE) 561 562 $(LD) -o $@ -T applications/hello/hello.ld $(HELLO_OBJS) 562 563 $(DU) -D $@ > $@.txt 563 564 mmd -o -i $(DISK_IMAGE) ::/build/hello || true 564 mcopy -o -i $(DISK_IMAGE) $@ ::/build/hello565 # mcopy -o -i $(DISK_IMAGE) $@ ::/build/hello 565 566 566 567 build/hello/main.o: applications/hello/main.c hard_config.h … … 569 570 ######################################## 570 571 ### pgcd compilation 571 build/pgcd/pgcd.elf: $(PGCD_OBJS) applications/pgcd/pgcd.ld hard_config.h 572 build/pgcd/pgcd.elf: $(PGCD_OBJS) applications/pgcd/pgcd.ld hard_config.h $(DISK_IMAGE) 572 573 $(LD) -o $@ -T applications/pgcd/pgcd.ld $(PGCD_OBJS) 573 574 $(DU) -D $@ > $@.txt 574 575 mmd -o -i $(DISK_IMAGE) ::/build/pgcd || true 575 mcopy -o -i $(DISK_IMAGE) $@ ::/build/pgcd576 # mcopy -o -i $(DISK_IMAGE) $@ ::/build/pgcd 576 577 577 578 build/pgcd/main.o: applications/pgcd/main.c hard_config.h … … 580 581 ######################################## 581 582 ### gameoflife compilation 582 build/gameoflife/gameoflife.elf: $(GAMEOFLIFE_OBJS) applications/gameoflife/gameoflife.ld 583 build/gameoflife/gameoflife.elf: $(GAMEOFLIFE_OBJS) applications/gameoflife/gameoflife.ld $(DISK_IMAGE) 583 584 $(LD) -o $@ -T applications/gameoflife/gameoflife.ld $(GAMEOFLIFE_OBJS) 584 585 $(DU) -D $@ > $@.txt 585 586 mmd -o -i $(DISK_IMAGE) ::/build/gameoflife || true 586 mcopy -o -i $(DISK_IMAGE) $@ ::/build/gameoflife587 # mcopy -o -i $(DISK_IMAGE) $@ ::/build/gameoflife 587 588 588 589 build/gameoflife/main.o: applications/gameoflife/main.c … … 591 592 ######################################## 592 593 ### dhrystone compilation 593 build/dhrystone/dhrystone.elf: $(DHRYSTONE_OBJS) applications/dhrystone/dhrystone.ld hard_config.h 594 build/dhrystone/dhrystone.elf: $(DHRYSTONE_OBJS) applications/dhrystone/dhrystone.ld hard_config.h $(DISK_IMAGE) 594 595 $(LD) -o $@ -T applications/dhrystone/dhrystone.ld $(DHRYSTONE_OBJS) 595 596 $(DU) -D $@ > $@.txt 596 597 mmd -o -i $(DISK_IMAGE) ::/build/dhrystone || true 597 mcopy -o -i $(DISK_IMAGE) $@ ::/build/dhrystone598 # mcopy -o -i $(DISK_IMAGE) $@ ::/build/dhrystone 598 599 599 600 build/dhrystone/dhry_1.o: applications/dhrystone/dhry_1.c hard_config.h … … 605 606 ######################################## 606 607 ### sort compilation 607 build/sort/sort.elf: $(SORT_OBJS) applications/sort/sort.ld hard_config.h 608 build/sort/sort.elf: $(SORT_OBJS) applications/sort/sort.ld hard_config.h $(DISK_IMAGE) 608 609 $(LD) -o $@ -T applications/sort/sort.ld $(SORT_OBJS) 609 610 $(DU) -D $@ > $@.txt 610 611 mmd -o -i $(DISK_IMAGE) ::/build/sort || true 611 mcopy -o -i $(DISK_IMAGE) $@ ::/build/sort612 613 build/sort/main.o: applications/sort/main.c 612 # mcopy -o -i $(DISK_IMAGE) $@ ::/build/sort 613 614 build/sort/main.o: applications/sort/main.c hard_config.h 614 615 $(CC) $(USER_INCLUDE) $(CFLAGS) -c -o $@ $< 615 616 616 617 ######################################## 617 618 ### transpose compilation 618 build/transpose/transpose.elf: $(TRANSPOSE_OBJS) applications/transpose/transpose.ld hard_config.h 619 build/transpose/transpose.elf: $(TRANSPOSE_OBJS) applications/transpose/transpose.ld hard_config.h $(DISK_IMAGE) 619 620 $(LD) -o $@ -T applications/transpose/transpose.ld $(TRANSPOSE_OBJS) 620 621 $(DU) -D $@ > $@.txt 621 622 mmd -o -i $(DISK_IMAGE) ::/build/transpose || true 622 mcopy -o -i $(DISK_IMAGE) $@ ::/build/transpose623 624 build/transpose/main.o: applications/transpose/main.c 623 # mcopy -o -i $(DISK_IMAGE) $@ ::/build/transpose 624 625 build/transpose/main.o: applications/transpose/main.c hard_config.h 625 626 $(CC) $(USER_INCLUDE) $(CFLAGS) -c -o $@ $< 626 627 627 628 ######################################## 628 629 ### convol compilation 629 build/convol/convol.elf: $(CONVOL_OBJS) applications/convol/convol.ld hard_config.h 630 build/convol/convol.elf: $(CONVOL_OBJS) applications/convol/convol.ld hard_config.h $(DISK_IMAGE) 630 631 $(LD) -o $@ -T applications/convol/convol.ld $(CONVOL_OBJS) 631 632 $(DU) -D $@ > $@.txt 632 633 mmd -o -i $(DISK_IMAGE) ::/build/convol || true 633 mcopy -o -i $(DISK_IMAGE) $@ ::/build/convol634 635 build/convol/main.o: applications/convol/main.c 634 # mcopy -o -i $(DISK_IMAGE) $@ ::/build/convol 635 636 build/convol/main.o: applications/convol/main.c hard_config.h 636 637 $(CC) $(USER_INCLUDE) $(CFLAGS) -O0 -c -o $@ $< 637 638 638 639 ######################################## 639 640 ### classif compilation 640 build/classif/classif.elf: $(CLASSIF_OBJS) applications/classif/classif.ld hard_config.h 641 build/classif/classif.elf: $(CLASSIF_OBJS) applications/classif/classif.ld hard_config.h $(DISK_IMAGE) 641 642 $(LD) -o $@ -T applications/classif/classif.ld $(CLASSIF_OBJS) 642 643 $(DU) -D $@ > $@.txt 643 644 mmd -o -i $(DISK_IMAGE) ::/build/classif || true 644 mcopy -o -i $(DISK_IMAGE) $@ ::/build/classif645 646 build/classif/main.o: applications/classif/main.c 645 # mcopy -o -i $(DISK_IMAGE) $@ ::/build/classif 646 647 build/classif/main.o: applications/classif/main.c hard_config.h 647 648 $(CC) $(USER_INCLUDE) $(CFLAGS) -O0 -c -o $@ $< 648 649 649 650 ######################################## 650 651 ### coproc compilation 651 build/coproc/coproc.elf: $(COPROC_OBJS) applications/coproc/coproc.ld hard_config.h 652 build/coproc/coproc.elf: $(COPROC_OBJS) applications/coproc/coproc.ld hard_config.h $(DISK_IMAGE) 652 653 $(LD) -o $@ -T applications/coproc/coproc.ld $(COPROC_OBJS) 653 654 $(DU) -D $@ > $@.txt 654 655 mmd -o -i $(DISK_IMAGE) ::/build/coproc || true 655 mcopy -o -i $(DISK_IMAGE) $@ ::/build/coproc656 # mcopy -o -i $(DISK_IMAGE) $@ ::/build/coproc 656 657 657 658 build/coproc/main.o: applications/coproc/main.c -
soft/giet_vm/giet_libs/stdio.c
r580 r581 375 375 376 376 vald -= (double)intp; 377 decp = (unsigned int)(vald * 100000000 );377 decp = (unsigned int)(vald * 1000000000); 378 378 379 379 for(i = 0; i < 10; i++)
Note: See TracChangeset
for help on using the changeset viewer.
