aboutsummaryrefslogtreecommitdiffstats
path: root/libraries
diff options
context:
space:
mode:
authorPatrick Lehmann <Patrick.Lehmann@plc2.de>2021-01-16 11:38:37 +0100
committerGitHub <noreply@github.com>2021-01-16 11:38:37 +0100
commit9c4c05ccad13f7496083d05c54c46b9243e94733 (patch)
treee9ef981dc22b6b56d4a210b2fc930d8af31b582d /libraries
parent115c91319dac7b71a8572dfbe3c64564962b14c9 (diff)
downloadghdl-9c4c05ccad13f7496083d05c54c46b9243e94733.tar.gz
ghdl-9c4c05ccad13f7496083d05c54c46b9243e94733.tar.bz2
ghdl-9c4c05ccad13f7496083d05c54c46b9243e94733.zip
Improvements to PoSh scripts after working on Bash scripts. (#1603)
Diffstat (limited to 'libraries')
-rw-r--r--libraries/vendors/compile-altera.ps143
-rw-r--r--libraries/vendors/compile-intel.ps139
-rw-r--r--libraries/vendors/compile-lattice.ps135
-rw-r--r--libraries/vendors/compile-osvvm.ps113
-rw-r--r--libraries/vendors/compile-uvvm.ps125
-rw-r--r--libraries/vendors/compile-xilinx-ise.ps127
-rw-r--r--libraries/vendors/compile-xilinx-vivado.ps121
-rw-r--r--libraries/vendors/shared.psm132
8 files changed, 121 insertions, 114 deletions
diff --git a/libraries/vendors/compile-altera.ps1 b/libraries/vendors/compile-altera.ps1
index e301038f5..76f47b1c4 100644
--- a/libraries/vendors/compile-altera.ps1
+++ b/libraries/vendors/compile-altera.ps1
@@ -150,26 +150,25 @@ cd $DestinationDirectory
$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008
# define global GHDL Options
-$GHDLOptions = @(
- "-a",
+$Analyze_Parameters = @(
"-fexplicit",
"-frelaxed-rules",
"--mb-comments",
"-Wbinding"
)
if (-not $EnableDebug)
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-hide"
)
}
if (-not ($EnableVerbose -or $EnableDebug))
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-library",
"-Wno-others",
"-Wno-static"
)
}
-$GHDLOptions += @(
+$Analyze_Parameters += @(
"--ieee=$VHDLFlavor",
"--no-vital-checks",
"--std=$VHDLStandard",
@@ -204,7 +203,7 @@ if ((-not $StopCompiling) -and $Altera)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -217,7 +216,7 @@ if ((-not $StopCompiling) -and $Altera)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -234,7 +233,7 @@ if ((-not $StopCompiling) -and $Altera)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -247,7 +246,7 @@ if ((-not $StopCompiling) -and $Altera)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -259,7 +258,7 @@ if ((-not $StopCompiling) -and $Altera)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -275,7 +274,7 @@ if ((-not $StopCompiling) -and $Max)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -290,7 +289,7 @@ if ((-not $StopCompiling) -and $Max)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -305,7 +304,7 @@ if ((-not $StopCompiling) -and $Max)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -322,7 +321,7 @@ if ((-not $StopCompiling) -and $Arria)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -337,7 +336,7 @@ if ((-not $StopCompiling) -and $Arria)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -353,7 +352,7 @@ if ((-not $StopCompiling) -and $Arria)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -370,7 +369,7 @@ if ((-not $StopCompiling) -and $Arria)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -387,7 +386,7 @@ if ((-not $StopCompiling) -and $Arria)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -402,7 +401,7 @@ if ((-not $StopCompiling) -and $Arria)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -419,7 +418,7 @@ if ((-not $StopCompiling) -and $Cyclone)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -434,7 +433,7 @@ if ((-not $StopCompiling) -and $Cyclone)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -449,7 +448,7 @@ if ((-not $StopCompiling) -and $Cyclone)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
diff --git a/libraries/vendors/compile-intel.ps1 b/libraries/vendors/compile-intel.ps1
index 77d69a940..e554f292d 100644
--- a/libraries/vendors/compile-intel.ps1
+++ b/libraries/vendors/compile-intel.ps1
@@ -150,26 +150,25 @@ cd $DestinationDirectory
$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008
# define global GHDL Options
-$GHDLOptions = @(
- "-a",
+$Analyze_Parameters = @(
"-fexplicit",
"-frelaxed-rules",
"--mb-comments",
"-Wbinding"
)
if (-not $EnableDebug)
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-hide"
)
}
if (-not ($EnableVerbose -or $EnableDebug))
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-library",
"-Wno-others",
"-Wno-static"
)
}
-$GHDLOptions += @(
+$Analyze_Parameters += @(
"--ieee=$VHDLFlavor",
"--no-vital-checks",
"--std=$VHDLStandard",
@@ -204,7 +203,7 @@ if ((-not $StopCompiling) -and $Altera)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -217,7 +216,7 @@ if ((-not $StopCompiling) -and $Altera)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -234,7 +233,7 @@ if ((-not $StopCompiling) -and $Altera)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -247,7 +246,7 @@ if ((-not $StopCompiling) -and $Altera)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -259,7 +258,7 @@ if ((-not $StopCompiling) -and $Altera)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -275,7 +274,7 @@ if ((-not $StopCompiling) -and $Max)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -290,7 +289,7 @@ if ((-not $StopCompiling) -and $Max)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -305,7 +304,7 @@ if ((-not $StopCompiling) -and $Max)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -322,7 +321,7 @@ if ((-not $StopCompiling) -and $Arria)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -337,7 +336,7 @@ if ((-not $StopCompiling) -and $Arria)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -353,7 +352,7 @@ if ((-not $StopCompiling) -and $Arria)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -370,7 +369,7 @@ if ((-not $StopCompiling) -and $Arria)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -387,7 +386,7 @@ if ((-not $StopCompiling) -and $Arria)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -402,7 +401,7 @@ if ((-not $StopCompiling) -and $Arria)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
@@ -419,7 +418,7 @@ if ((-not $StopCompiling) -and $Cyclone)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
if (Test-Path $SourceFiles[0])
- { $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ { $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
diff --git a/libraries/vendors/compile-lattice.ps1 b/libraries/vendors/compile-lattice.ps1
index a1b91abe6..ef8d1b59a 100644
--- a/libraries/vendors/compile-lattice.ps1
+++ b/libraries/vendors/compile-lattice.ps1
@@ -177,26 +177,25 @@ cd $DestinationDirectory
$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008
# define global GHDL Options
-$GHDLOptions = @(
- "-a",
+$Analyze_Parameters = @(
"-fexplicit",
"-frelaxed-rules",
"--mb-comments",
"-Wbinding"
)
if (-not $EnableDebug)
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-hide"
)
}
if (-not ($EnableVerbose -or $EnableDebug))
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-library",
"-Wno-others",
"-Wno-static"
)
}
-$GHDLOptions += @(
+$Analyze_Parameters += @(
"--ieee=$VHDLFlavor",
"--no-vital-checks",
"--std=$VHDLStandard",
@@ -241,7 +240,7 @@ if ((-not $StopCompiling) -and $ec)
{ $Library = "ec"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -251,7 +250,7 @@ if ((-not $StopCompiling) -and $ecp)
{ $Library = "ecp"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -261,7 +260,7 @@ if ((-not $StopCompiling) -and $ecp2)
{ $Library = "ecp2"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -271,7 +270,7 @@ if ((-not $StopCompiling) -and $ecp3)
{ $Library = "ecp3"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -281,7 +280,7 @@ if ((-not $StopCompiling) -and $ecp5u)
{ $Library = "ecp5u"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -291,7 +290,7 @@ if ((-not $StopCompiling) -and $lptm)
{ $Library = "lptm"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -301,7 +300,7 @@ if ((-not $StopCompiling) -and $lptm2)
{ $Library = "lptm2"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -311,7 +310,7 @@ if ((-not $StopCompiling) -and $MachXO)
{ $Library = "MachXO"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -321,7 +320,7 @@ if ((-not $StopCompiling) -and $MachXO2)
{ $Library = "MachXO2"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -331,7 +330,7 @@ if ((-not $StopCompiling) -and $machxo3l)
{ $Library = "machxo3l"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -341,7 +340,7 @@ if ((-not $StopCompiling) -and $machxo3d)
{ $Library = "machxo3d"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -351,7 +350,7 @@ if ((-not $StopCompiling) -and $sc)
{ $Library = "sc"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -361,7 +360,7 @@ if ((-not $StopCompiling) -and $scm)
{ $Library = "scm"
$SourceFiles = $FileLists[$Library] | % { "$SourceDirectory\$Library\src\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
diff --git a/libraries/vendors/compile-osvvm.ps1 b/libraries/vendors/compile-osvvm.ps1
index 476c102b3..318d8bdaf 100644
--- a/libraries/vendors/compile-osvvm.ps1
+++ b/libraries/vendors/compile-osvvm.ps1
@@ -112,28 +112,27 @@ $GHDLBinary = Get-GHDLBinary $GHDL
New-DestinationDirectory $DestinationDirectory
cd $DestinationDirectory
-$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables
+$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables -VHDL2008
# define global GHDL Options
-$GHDLOptions = @(
- "-a",
+$Analyze_Parameters = @(
"-fexplicit",
"-frelaxed-rules",
"--mb-comments",
"-Wbinding"
)
if (-not $EnableDebug)
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-hide"
)
}
if (-not ($EnableVerbose -or $EnableDebug))
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-others",
"-Wno-static"
)
}
-$GHDLOptions += @(
+$Analyze_Parameters += @(
"--ieee=$VHDLFlavor",
"--no-vital-checks",
"--std=$VHDLStandard",
@@ -321,7 +320,7 @@ foreach ($VIPName in $FileSets.Keys)
$Library = $FileSets[$VIPName]["Libraries"][$LibraryName]["Library"]
$SourceFiles = $FileSets[$VIPName]["Libraries"][$LibraryName]["Files"]
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
diff --git a/libraries/vendors/compile-uvvm.ps1 b/libraries/vendors/compile-uvvm.ps1
index e548ba8cf..8b79d6d57 100644
--- a/libraries/vendors/compile-uvvm.ps1
+++ b/libraries/vendors/compile-uvvm.ps1
@@ -141,29 +141,28 @@ cd $DestinationDirectory
$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables
# define global GHDL Options
-$GHDLOptions = @(
- "-a",
- "-fexplicit",
- "-frelaxed-rules",
+$Analyze_Parameters = @(
"--mb-comments",
- "-Wbinding"
+ "-Wbinding",
+ "-fexplicit",
+ "-Wno-shared" # UVVM specific
)
if (-not $EnableDebug)
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-hide"
)
}
if (-not ($EnableVerbose -or $EnableDebug))
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-others",
- "-Wno-static",
- "-Wno-shared" # UVVM specific
+ "-Wno-static"
)
}
-$GHDLOptions += @(
+$Analyze_Parameters += @(
"--ieee=$VHDLFlavor",
"--no-vital-checks",
"--std=$VHDLStandard",
+ "-frelaxed",
"-P$DestinationDirectory"
)
@@ -249,7 +248,7 @@ if ((-not $StopCompiling) -and $UVVM_Utilities)
{ $Library = "uvvm_util"
$SourceFiles = $UVVM_Util_Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -258,7 +257,7 @@ if ((-not $StopCompiling) -and $UVVM_VCC_Framework)
{ $Library = "uvvm_vvc_framework"
$SourceFiles = $UVVM_VVC_Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -268,7 +267,7 @@ foreach ($vip in $VIP_Files.Keys)
{ $Library = $VIP_Files[$vip]["Library"]
$SourceFiles = $VIP_Files[$vip]["Files"] #| % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
}
diff --git a/libraries/vendors/compile-xilinx-ise.ps1 b/libraries/vendors/compile-xilinx-ise.ps1
index cc4884a06..5c51f8f25 100644
--- a/libraries/vendors/compile-xilinx-ise.ps1
+++ b/libraries/vendors/compile-xilinx-ise.ps1
@@ -143,26 +143,25 @@ if ($VHDL2008)
$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008
# define global GHDL Options
-$GHDLOptions = @(
- "-a",
+$Analyze_Parameters = @(
"-fexplicit",
"-frelaxed-rules",
"--mb-comments",
"-Wbinding"
)
if (-not $EnableDebug)
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-hide"
)
}
if (-not ($EnableVerbose -or $EnableDebug))
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-library",
"-Wno-others",
"-Wno-static"
)
}
-$GHDLOptions += @(
+$Analyze_Parameters += @(
"--ieee=$VHDLFlavor",
"--no-vital-checks",
"--std=$VHDLStandard",
@@ -198,7 +197,7 @@ if ((-not $StopCompiling) -and $Unisim)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -207,7 +206,7 @@ if ((-not $StopCompiling) -and $Unisim)
{ $Library = "unisim"
$SourceFiles = dir "$SourceDirectory\unisims\primitive\*.vhd*"
- $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -216,7 +215,7 @@ if ((-not $StopCompiling) -and $Unisim -and $SecureIP)
{ $Library = "secureip"
$SourceFiles = dir "$SourceDirectory\unisims\secureip\*.vhd*"
- $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -230,7 +229,7 @@ if ((-not $StopCompiling) -and $Unimacro)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -239,7 +238,7 @@ if ((-not $StopCompiling) -and $Unimacro)
{ $Library = "unimacro"
$SourceFiles = dir "$SourceDirectory\unimacro\*_MACRO.vhd*"
- $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -254,7 +253,7 @@ if ((-not $StopCompiling) -and $Simprim)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -263,7 +262,7 @@ if ((-not $StopCompiling) -and $Simprim)
{ $Library = "simprim"
$SourceFiles = dir "$SourceDirectory\simprims\primitive\other\*.vhd*"
- $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -272,7 +271,7 @@ if ((-not $StopCompiling) -and $Simprim -and $SecureIP)
{ $Library = "secureip"
$SourceFiles = dir "$SourceDirectory\simprims\secureip\other\*.vhd*"
- $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -295,7 +294,7 @@ if ((-not $StopCompiling) -and $CoreLib)
{ $SourceFiles += "$SourceDirectory\XilinxCoreLib\$line" }
}
- $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
diff --git a/libraries/vendors/compile-xilinx-vivado.ps1 b/libraries/vendors/compile-xilinx-vivado.ps1
index 52bd9bf82..d0fb0698a 100644
--- a/libraries/vendors/compile-xilinx-vivado.ps1
+++ b/libraries/vendors/compile-xilinx-vivado.ps1
@@ -134,26 +134,25 @@ if ($VHDL2008)
$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008
# define global GHDL Options
-$GHDLOptions = @(
- "-a",
+$Analyze_Parameters = @(
"-fexplicit",
"-frelaxed-rules",
"--mb-comments",
"-Wbinding"
)
if (-not $EnableDebug)
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-hide"
)
}
if (-not ($EnableVerbose -or $EnableDebug))
-{ $GHDLOptions += @(
+{ $Analyze_Parameters += @(
"-Wno-library",
"-Wno-others",
"-Wno-static"
)
}
-$GHDLOptions += @(
+$Analyze_Parameters += @(
"--ieee=$VHDLFlavor",
"--no-vital-checks",
"--std=$VHDLStandard",
@@ -191,7 +190,7 @@ if ((-not $StopCompiling) -and $Unisim)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -200,7 +199,7 @@ if ((-not $StopCompiling) -and $Unisim)
{ $Library = "unisim"
$SourceFiles = dir "$SourceDirectory\unisims\primitive\*.vhd*"
- $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -209,7 +208,7 @@ if ((-not $StopCompiling) -and $Unisim)
{ $Library = "unisim"
$SourceFiles = dir "$SourceDirectory\unisims\retarget\*.vhd*"
- $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -218,7 +217,7 @@ if ((-not $StopCompiling) -and $Unisim -and $SecureIP)
{ $Library = "secureip"
$SourceFiles = dir "$SourceDirectory\unisims\secureip\*.vhd*"
- $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -232,7 +231,7 @@ if ((-not $StopCompiling) -and $Unimacro)
)
$SourceFiles = $Files | % { "$SourceDirectory\$_" }
- $ErrorCount += Start-PackageCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PackageCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
@@ -241,7 +240,7 @@ if ((-not $StopCompiling) -and $Unimacro)
{ $Library = "unimacro"
$SourceFiles = dir "$SourceDirectory\unimacro\*_MACRO.vhd*"
- $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $GHDLOptions $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
+ $ErrorCount += Start-PrimitiveCompilation $GHDLBinary $Analyze_Parameters $DestinationDirectory $Library $VHDLVersion $SourceFiles $SuppressWarnings $HaltOnError -Verbose:$EnableVerbose -Debug:$EnableDebug
$StopCompiling = $HaltOnError -and ($ErrorCount -ne 0)
}
diff --git a/libraries/vendors/shared.psm1 b/libraries/vendors/shared.psm1
index 33f322e55..eb3c4c037 100644
--- a/libraries/vendors/shared.psm1
+++ b/libraries/vendors/shared.psm1
@@ -188,8 +188,8 @@ function Get-VHDLVariables
#>
[CmdletBinding()]
param(
- [bool]$VHDL93 = $false,
- [bool]$VHDL2008 = $true
+ [switch]$VHDL93 = $false,
+ [switch]$VHDL2008 = $true
)
if ($VHDL93)
@@ -260,7 +260,7 @@ function Start-PackageCompilation
[CmdletBinding()]
param(
[Parameter(Mandatory=$true)][string]$GHDLBinary,
- [Parameter(Mandatory=$true)][string[]]$GHDLOptions,
+ [Parameter(Mandatory=$true)][string[]]$Analyze_Parameters,
[Parameter(Mandatory=$true)][string]$DestinationDirectory,
[Parameter(Mandatory=$true)][string]$Library,
[Parameter(Mandatory=$true)][string]$VHDLVersion,
@@ -272,8 +272,12 @@ function Start-PackageCompilation
$EnableDebug = [bool]$PSCmdlet.MyInvocation.BoundParameters["Debug"]
$EnableVerbose = [bool]$PSCmdlet.MyInvocation.BoundParameters["Verbose"] -or $EnableDebug
+ $Parameters = $Analyze_Parameters
+
if ($EnableDebug)
- { $Indent = " " }
+ { $Parameters += "-v"
+ $Indent = " "
+ }
elseif ($EnableVerbose)
{ $Indent = " " }
else
@@ -289,7 +293,7 @@ function Start-PackageCompilation
$ErrorCount = 0
foreach ($File in $SourceFiles)
{ Write-Host " Analyzing package file '$File'" -ForegroundColor DarkCyan
- $InvokeExpr = "& '$GHDLBinary' " + ($GHDLOptions -join " ") + " --work=$Library " + $File + " 2>&1"
+ $InvokeExpr = "& '$GHDLBinary' -a " + ($Parameters -join " ") + " --work=$Library " + $File + " 2>&1"
$EnableDebug -and (Write-Host " $InvokeExpr" -ForegroundColor DarkGray ) | Out-Null
$ErrorRecordFound = Invoke-Expression $InvokeExpr | Restore-NativeCommandStream | Write-ColoredGHDLLine $SuppressWarnings -Indent:"$Indent"
if (($LastExitCode -ne 0) -or $ErrorRecordFound)
@@ -325,7 +329,7 @@ function Start-PrimitiveCompilation
[CmdletBinding()]
param(
[Parameter(Mandatory=$true)][string]$GHDLBinary,
- [Parameter(Mandatory=$true)][string[]]$GHDLOptions,
+ [Parameter(Mandatory=$true)][string[]]$Analyze_Parameters,
[Parameter(Mandatory=$true)][string]$DestinationDirectory,
[Parameter(Mandatory=$true)][string]$Library,
[Parameter(Mandatory=$true)][string]$VHDLVersion,
@@ -337,8 +341,12 @@ function Start-PrimitiveCompilation
$EnableDebug = [bool]$PSCmdlet.MyInvocation.BoundParameters["Debug"]
$EnableVerbose = [bool]$PSCmdlet.MyInvocation.BoundParameters["Verbose"] -or $EnableDebug
+ $Parameters = $Analyze_Parameters
+
if ($EnableDebug)
- { $Indent = " " }
+ { $Parameters += "-v"
+ $Indent = " "
+ }
elseif ($EnableVerbose)
{ $Indent = " " }
else
@@ -356,8 +364,8 @@ function Start-PrimitiveCompilation
$ErrorCount = 0
foreach ($File in $SourceFiles)
{ $EnableVerbose -and (Write-Host " Analyzing primitive file '$File'" -ForegroundColor DarkCyan ) | Out-Null
- $InvokeExpr = "& '$GHDLBinary' " + ($GHDLOptions -join " ") + " --work=$Library " + $File + " 2>&1"
- $EnableDebug -and (Write-Host " $InvokeExpr" -ForegroundColor DarkGray ) | Out-Null
+ $InvokeExpr = "& '$GHDLBinary' -a " + ($Parameters -join " ") + " --work=$Library " + $File + " 2>&1"
+ $EnableDebug -and (Write-Host " $InvokeExpr" -ForegroundColor DarkGray ) | Out-Null
$ErrorRecordFound = Invoke-Expression $InvokeExpr | Restore-NativeCommandStream | Write-ColoredGHDLLine $SuppressWarnings -Indent:"$Indent"
if (($LastExitCode -ne 0) -or $ErrorRecordFound)
{ $ErrorCount += 1
@@ -444,6 +452,12 @@ function Write-ColoredGHDLLine
Write-Host $InputObject
}
}
+ elseif ($InputObject -match ":\d+:\d+:note:\s")
+ { if (-not $SuppressWarnings)
+ { Write-Host "${Indent}NOTE: " -NoNewline -ForegroundColor DarkCyan
+ Write-Host $InputObject
+ }
+ }
elseif ($InputObject -match ":\d+:\d+:\s")
{ $ErrorRecordFound = $true
Write-Host "${Indent}ERROR: " -NoNewline -ForegroundColor Red