diff options
| -rw-r--r-- | adder-and-display/adder-and-display.srcs/sources_1/bin2bcd.vhd | 28 | ||||
| -rw-r--r-- | adder-and-display/adder-and-display.xpr | 29 | 
2 files changed, 38 insertions, 19 deletions
| diff --git a/adder-and-display/adder-and-display.srcs/sources_1/bin2bcd.vhd b/adder-and-display/adder-and-display.srcs/sources_1/bin2bcd.vhd index 4bb18bb..548c9e5 100644 --- a/adder-and-display/adder-and-display.srcs/sources_1/bin2bcd.vhd +++ b/adder-and-display/adder-and-display.srcs/sources_1/bin2bcd.vhd @@ -11,23 +11,23 @@ architecture Behavioral of bin2bcd is  begin  	with I select  		X <= -			x"0" when x"00" | x"0a" | x"14" | x"1e", -			x"1" when x"01" | x"0b" | x"15" | x"1f", -			x"2" when x"02" | x"0c" | x"16", -			x"3" when x"03" | x"0d" | x"17", -			x"4" when x"04" | x"0e" | x"18", -			x"5" when x"05" | x"0f" | x"19", -			x"6" when x"06" | x"10" | x"1a", -			x"7" when x"07" | x"11" | x"1b", -			x"8" when x"08" | x"12" | x"1c", -			x"9" when x"09" | x"13" | x"1d", +			b"0000" when b"00000" | b"01010" | b"10100" | b"11110", +			b"0001" when b"00001" | b"01011" | b"10101" | b"11111", +			b"0010" when b"00010" | b"01100" | b"10110", +			b"0011" when b"00011" | b"01101" | b"10111", +			b"0100" when b"00100" | b"01110" | b"11000", +			b"0101" when b"00101" | b"01111" | b"11001", +			b"0110" when b"00110" | b"10000" | b"11010", +			b"0111" when b"00111" | b"10001" | b"11011", +			b"1000" when b"01000" | b"10010" | b"11100", +			b"1001" when b"01001" | b"10011" | b"11101",  			(others => '0') when others;  	with I select  		Y <= -			x"0" when x"00" | x"01" | x"02" | x"03" | x"04" | x"05" | x"06" | x"07" | x"08" | x"09", -			x"1" when x"0a" | x"0b" | x"0c" | x"0d" | x"0e" | x"0f" | x"10" | x"11" | x"12" | x"13", -			x"2" when x"14" | x"15" | x"16" | x"17" | x"18" | x"19" | x"1a" | x"1b" | x"1c" | x"1d", -			x"3" when x"1e" | x"1f", +			b"0000" when b"00000" | b"00001" | b"00010" | b"00011" | b"00100" | b"00101" | b"00110" | b"00111" | b"01000" | b"01001", +			b"0001" when b"01010" | b"01011" | b"01100" | b"01101" | b"01110" | b"01111" | b"10000" | b"10001" | b"10010" | b"10011", +			b"0010" when b"10100" | b"10101" | b"10110" | b"10111" | b"11000" | b"11001" | b"11010" | b"11011" | b"11100" | b"11101", +			b"0011" when b"11110" | b"11111",  			(others => '0') when others;  end Behavioral; diff --git a/adder-and-display/adder-and-display.xpr b/adder-and-display/adder-and-display.xpr index 5dcc304..0a0e2ef 100644 --- a/adder-and-display/adder-and-display.xpr +++ b/adder-and-display/adder-and-display.xpr @@ -59,7 +59,7 @@      <Option Name="IPStaticSourceDir" Val="$PIPUSERFILESDIR/ipstatic"/>      <Option Name="EnableBDX" Val="FALSE"/>      <Option Name="DSABoardId" Val="basys3"/> -    <Option Name="WTXSimLaunchSim" Val="0"/> +    <Option Name="WTXSimLaunchSim" Val="14"/>      <Option Name="WTModelSimLaunchSim" Val="0"/>      <Option Name="WTQuestaLaunchSim" Val="0"/>      <Option Name="WTIesLaunchSim" Val="0"/> @@ -160,11 +160,30 @@      </FileSet>      <FileSet Name="sim_1" Type="SimulationSrcs" RelSrcDir="$PSRCDIR/sim_1" RelGenDir="$PGENDIR/sim_1">        <Filter Type="Srcs"/> +      <File Path="$PSRCDIR/sim_1/bin2bcd_tb.vhd"> +        <FileInfo> +          <Attr Name="UsedIn" Val="synthesis"/> +          <Attr Name="UsedIn" Val="simulation"/> +        </FileInfo> +      </File> +      <File Path="$PSRCDIR/sim_1/dispdrv.vhd"> +        <FileInfo> +          <Attr Name="AutoDisabled" Val="1"/> +          <Attr Name="UsedIn" Val="synthesis"/> +          <Attr Name="UsedIn" Val="simulation"/> +        </FileInfo> +      </File> +      <File Path="$PSRCDIR/sim_1/dispdrv_tb.vhd"> +        <FileInfo> +          <Attr Name="AutoDisabled" Val="1"/> +          <Attr Name="UsedIn" Val="synthesis"/> +          <Attr Name="UsedIn" Val="simulation"/> +        </FileInfo> +      </File>        <Config>          <Option Name="DesignMode" Val="RTL"/> -        <Option Name="TopModule" Val="main"/> +        <Option Name="TopModule" Val="bin2bcd_tb"/>          <Option Name="TopLib" Val="xil_defaultlib"/> -        <Option Name="TopAutoSet" Val="TRUE"/>          <Option Name="TransportPathDelay" Val="0"/>          <Option Name="TransportIntDelay" Val="0"/>          <Option Name="SelectedSimModel" Val="rtl"/> @@ -173,6 +192,7 @@          <Option Name="PamSignalDriverFile" Val="xil_bypass_driver"/>          <Option Name="PamPseudoTop" Val="pseudo_tb"/>          <Option Name="SrcSet" Val="sources_1"/> +        <Option Name="NLNetlistMode" Val="funcsim"/>        </Config>      </FileSet>      <FileSet Name="utils_1" Type="Utils" RelSrcDir="$PSRCDIR/utils_1" RelGenDir="$PGENDIR/utils_1"> @@ -222,7 +242,7 @@        <Report Name="ROUTE_DESIGN.REPORT_METHODOLOGY" Enabled="1"/>        <RQSFiles/>      </Run> -    <Run Id="impl_1" Type="Ft2:EntireDesign" Part="xc7a35tcpg236-1" ConstrsSet="constrs_1" Description="Default settings for Implementation." AutoIncrementalCheckpoint="false" WriteIncrSynthDcp="false" State="current" Dir="$PRUNDIR/impl_1" SynthRun="synth_1" IncludeInArchive="true" IsChild="false" GenFullBitstream="true" AutoIncrementalDir="$PSRCDIR/utils_1/imports/impl_1" AutoRQSDir="$PSRCDIR/utils_1/imports/impl_1"> +    <Run Id="impl_1" Type="Ft2:EntireDesign" Part="xc7a35tcpg236-1" ConstrsSet="constrs_1" Description="Default settings for Implementation." AutoIncrementalCheckpoint="false" WriteIncrSynthDcp="false" State="current" SynthRun="synth_1" IncludeInArchive="true" IsChild="false" GenFullBitstream="true" AutoIncrementalDir="$PSRCDIR/utils_1/imports/impl_1" AutoRQSDir="$PSRCDIR/utils_1/imports/impl_1">        <Strategy Version="1" Minor="2">          <StratHandle Name="Vivado Implementation Defaults" Flow="Vivado Implementation 2022"/>          <Step Id="init_design"/> @@ -235,7 +255,6 @@          <Step Id="post_route_phys_opt_design"/>          <Step Id="write_bitstream"/>        </Strategy> -      <GeneratedRun Dir="$PRUNDIR" File="gen_run.xml"/>        <ReportStrategy Name="Vivado Implementation Default Reports" Flow="Vivado Implementation 2022"/>        <Report Name="ROUTE_DESIGN.REPORT_METHODOLOGY" Enabled="1"/>        <RQSFiles/> |