diff options
| author | Tristan Gingold | 2013-12-17 06:25:53 +0100 |
|---|---|---|
| committer | Tristan Gingold | 2013-12-17 06:25:53 +0100 |
| commit | 48448a12ef628218db298d8b7c6879e28cdd019a (patch) | |
| tree | 7e612d41dc01c435cf32e3cee029b429c9362bb9 /translate/ghdldrv | |
| parent | 04ad1cd54d99fc3ac3d82c69ee5f7c2db7e2275a (diff) | |
| download | ghdl-48448a12ef628218db298d8b7c6879e28cdd019a.tar.gz ghdl-48448a12ef628218db298d8b7c6879e28cdd019a.tar.bz2 ghdl-48448a12ef628218db298d8b7c6879e28cdd019a.zip | |
Sync tree: add parsing of AMS-VHDL, add Darwin syntax in asm files.
Diffstat (limited to 'translate/ghdldrv')
| -rw-r--r-- | translate/ghdldrv/Makefile | 4 | ||||
| -rw-r--r-- | translate/ghdldrv/ghdlprint.adb | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/translate/ghdldrv/Makefile b/translate/ghdldrv/Makefile index b4199a9..47f6e0f 100644 --- a/translate/ghdldrv/Makefile +++ b/translate/ghdldrv/Makefile @@ -61,7 +61,7 @@ ortho_code-x86-flags.ads: echo "package Ortho_Code.X86.Flags renames Ortho_Code.X86.$(ORTHO_X86_FLAGS);" >> $@ ghdl_mcode: GRT_FLAGS+=-DWITH_GNAT_RUN_TIME -ghdl_mcode: default_pathes.ads $(GRT_ADD_OBJS) $(ORTHO_DEPS) memsegs_c.o chkstk.o force +ghdl_mcode: default_pathes.ads $(GRT_ADD_OBJS) $(ORTHO_DEPS) memsegs_c.o chkstk.o force $(GNATMAKE) -aI../../ortho/mcode -aI../../ortho $(GNATFLAGS) ghdl_mcode $(GNAT_BARGS) -largs memsegs_c.o chkstk.o $(GNAT_LARGS) $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) ghdl_llvm_jit: GRT_FLAGS+=-DWITH_GNAT_RUN_TIME @@ -158,7 +158,7 @@ install.simul: $(MAKE) GHDL=ghdl_simul install.v87 install.v93 clean: force - $(RM) -f *.o *.ali ghdl_gcc ghdl_mcode + $(RM) -f *.o *.ali ghdl_gcc ghdl_mcode $(RM) -f b~*.ad? *~ default_pathes.ads $(RM) -rf ../lib diff --git a/translate/ghdldrv/ghdlprint.adb b/translate/ghdldrv/ghdlprint.adb index 9eaba5c..dedc1eb 100644 --- a/translate/ghdldrv/ghdlprint.adb +++ b/translate/ghdldrv/ghdlprint.adb @@ -374,17 +374,11 @@ package body Ghdlprint is Disp_Spaces; Disp_Text; when Tok_Xnor .. Tok_Ror => - if Flags.Vhdl_Std > Vhdl_87 then - Disp_Reserved; - else - Disp_Identifier; - end if; + Disp_Reserved; when Tok_Protected => - if Flags.Vhdl_Std >= Vhdl_00 then - Disp_Reserved; - else - Disp_Identifier; - end if; + Disp_Reserved; + when Tok_Across .. Tok_Tolerance => + Disp_Reserved; when Tok_Psl_Default | Tok_Psl_Clock | Tok_Psl_Property @@ -429,6 +423,7 @@ package body Ghdlprint is end if; when Tok_Left_Paren .. Tok_Colon | Tok_Comma .. Tok_Dot + | Tok_Equal_Equal | Tok_Integer | Tok_Real | Tok_Equal .. Tok_Slash |