mirror of
https://github.com/verilator/verilator.git
synced 2025-01-01 04:07:34 +00:00
Fix large constant buffer overflow (#4556)
This commit is contained in:
Varun Koyyalagunta
GitHub
parent
d699caf255
commit
edfd3d7206
@ -2111,60 +2111,60 @@ static inline WDataOutP VL_CONST_W_8X(int obits, WDataOutP o,
|
||||
VL_C_END_(obits, 8);
|
||||
}
|
||||
//
|
||||
static inline WDataOutP VL_CONSTHI_W_1X(int obits, int lsb, WDataOutP obase,
|
||||
static inline WDataOutP VL_CONSTHI_W_1X(int obits, int lsb, WDataOutP o,
|
||||
EData d0) VL_MT_SAFE {
|
||||
WDataOutP o = obase + VL_WORDS_I(lsb);
|
||||
o[0] = d0;
|
||||
WDataOutP ohi = o + VL_WORDS_I(lsb);
|
||||
ohi[0] = d0;
|
||||
VL_C_END_(obits, VL_WORDS_I(lsb) + 1);
|
||||
}
|
||||
static inline WDataOutP VL_CONSTHI_W_2X(int obits, int lsb, WDataOutP obase,
|
||||
static inline WDataOutP VL_CONSTHI_W_2X(int obits, int lsb, WDataOutP o,
|
||||
EData d1, EData d0) VL_MT_SAFE {
|
||||
WDataOutP o = obase + VL_WORDS_I(lsb);
|
||||
o[0] = d0; o[1] = d1;
|
||||
WDataOutP ohi = o + VL_WORDS_I(lsb);
|
||||
ohi[0] = d0; ohi[1] = d1;
|
||||
VL_C_END_(obits, VL_WORDS_I(lsb) + 2);
|
||||
}
|
||||
static inline WDataOutP VL_CONSTHI_W_3X(int obits, int lsb, WDataOutP obase,
|
||||
static inline WDataOutP VL_CONSTHI_W_3X(int obits, int lsb, WDataOutP o,
|
||||
EData d2, EData d1, EData d0) VL_MT_SAFE {
|
||||
WDataOutP o = obase + VL_WORDS_I(lsb);
|
||||
o[0] = d0; o[1] = d1; o[2] = d2;
|
||||
WDataOutP ohi = o + VL_WORDS_I(lsb);
|
||||
ohi[0] = d0; ohi[1] = d1; ohi[2] = d2;
|
||||
VL_C_END_(obits, VL_WORDS_I(lsb) + 3);
|
||||
}
|
||||
static inline WDataOutP VL_CONSTHI_W_4X(int obits, int lsb, WDataOutP obase,
|
||||
static inline WDataOutP VL_CONSTHI_W_4X(int obits, int lsb, WDataOutP o,
|
||||
EData d3, EData d2, EData d1, EData d0) VL_MT_SAFE {
|
||||
WDataOutP o = obase + VL_WORDS_I(lsb);
|
||||
o[0] = d0; o[1] = d1; o[2] = d2; o[3] = d3;
|
||||
WDataOutP ohi = o + VL_WORDS_I(lsb);
|
||||
ohi[0] = d0; ohi[1] = d1; ohi[2] = d2; ohi[3] = d3;
|
||||
VL_C_END_(obits, VL_WORDS_I(lsb) + 4);
|
||||
}
|
||||
static inline WDataOutP VL_CONSTHI_W_5X(int obits, int lsb, WDataOutP obase,
|
||||
static inline WDataOutP VL_CONSTHI_W_5X(int obits, int lsb, WDataOutP o,
|
||||
EData d4,
|
||||
EData d3, EData d2, EData d1, EData d0) VL_MT_SAFE {
|
||||
WDataOutP o = obase + VL_WORDS_I(lsb);
|
||||
o[0] = d0; o[1] = d1; o[2] = d2; o[3] = d3;
|
||||
o[4] = d4;
|
||||
WDataOutP ohi = o + VL_WORDS_I(lsb);
|
||||
ohi[0] = d0; ohi[1] = d1; ohi[2] = d2; ohi[3] = d3;
|
||||
ohi[4] = d4;
|
||||
VL_C_END_(obits, VL_WORDS_I(lsb) + 5);
|
||||
}
|
||||
static inline WDataOutP VL_CONSTHI_W_6X(int obits, int lsb, WDataOutP obase,
|
||||
static inline WDataOutP VL_CONSTHI_W_6X(int obits, int lsb, WDataOutP o,
|
||||
EData d5, EData d4,
|
||||
EData d3, EData d2, EData d1, EData d0) VL_MT_SAFE {
|
||||
WDataOutP o = obase + VL_WORDS_I(lsb);
|
||||
o[0] = d0; o[1] = d1; o[2] = d2; o[3] = d3;
|
||||
o[4] = d4; o[5] = d5;
|
||||
WDataOutP ohi = o + VL_WORDS_I(lsb);
|
||||
ohi[0] = d0; ohi[1] = d1; ohi[2] = d2; ohi[3] = d3;
|
||||
ohi[4] = d4; ohi[5] = d5;
|
||||
VL_C_END_(obits, VL_WORDS_I(lsb) + 6);
|
||||
}
|
||||
static inline WDataOutP VL_CONSTHI_W_7X(int obits, int lsb, WDataOutP obase,
|
||||
static inline WDataOutP VL_CONSTHI_W_7X(int obits, int lsb, WDataOutP o,
|
||||
EData d6, EData d5, EData d4,
|
||||
EData d3, EData d2, EData d1, EData d0) VL_MT_SAFE {
|
||||
WDataOutP o = obase + VL_WORDS_I(lsb);
|
||||
o[0] = d0; o[1] = d1; o[2] = d2; o[3] = d3;
|
||||
o[4] = d4; o[5] = d5; o[6] = d6;
|
||||
WDataOutP ohi = o + VL_WORDS_I(lsb);
|
||||
ohi[0] = d0; ohi[1] = d1; ohi[2] = d2; ohi[3] = d3;
|
||||
ohi[4] = d4; ohi[5] = d5; ohi[6] = d6;
|
||||
VL_C_END_(obits, VL_WORDS_I(lsb) + 7);
|
||||
}
|
||||
static inline WDataOutP VL_CONSTHI_W_8X(int obits, int lsb, WDataOutP obase,
|
||||
static inline WDataOutP VL_CONSTHI_W_8X(int obits, int lsb, WDataOutP o,
|
||||
EData d7, EData d6, EData d5, EData d4,
|
||||
EData d3, EData d2, EData d1, EData d0) VL_MT_SAFE {
|
||||
WDataOutP o = obase + VL_WORDS_I(lsb);
|
||||
o[0] = d0; o[1] = d1; o[2] = d2; o[3] = d3;
|
||||
o[4] = d4; o[5] = d5; o[6] = d6; o[7] = d7;
|
||||
WDataOutP ohi = o + VL_WORDS_I(lsb);
|
||||
ohi[0] = d0; ohi[1] = d1; ohi[2] = d2; ohi[3] = d3;
|
||||
ohi[4] = d4; ohi[5] = d5; ohi[6] = d6; ohi[7] = d7;
|
||||
VL_C_END_(obits, VL_WORDS_I(lsb) + 8);
|
||||
}
|
||||
|
||||
|
||||
21
test_regress/t/t_struct_param_overflow.pl
Executable file
21
test_regress/t/t_struct_param_overflow.pl
Executable file
@ -0,0 +1,21 @@
|
||||
#!/usr/bin/env perl
|
||||
if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; }
|
||||
# DESCRIPTION: Verilator: Verilog Test driver/expect definition
|
||||
#
|
||||
# Copyright 2023 by Wilson Snyder. This program is free software; you
|
||||
# can redistribute it and/or modify it under the terms of either the GNU
|
||||
# Lesser General Public License Version 3 or the Perl Artistic License
|
||||
# Version 2.0.
|
||||
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
|
||||
|
||||
scenarios(simulator => 1);
|
||||
|
||||
compile(
|
||||
);
|
||||
|
||||
execute(
|
||||
check_finished => 1,
|
||||
);
|
||||
|
||||
ok(1);
|
||||
1;
|
||||
81
test_regress/t/t_struct_param_overflow.v
Normal file
81
test_regress/t/t_struct_param_overflow.v
Normal file
@ -0,0 +1,81 @@
|
||||
// DESCRIPTION: Verilator: Verilog Test module
|
||||
//
|
||||
// This file ONLY is placed into the Public Domain, for any use,
|
||||
// without warranty, 2023 by Varun Koyyalagunta.
|
||||
// SPDX-License-Identifier: CC0-1.0
|
||||
|
||||
package config_pkg;
|
||||
|
||||
localparam int unsigned N = 10;
|
||||
|
||||
typedef struct packed {
|
||||
logic [N-1:0][31:0] lo;
|
||||
logic [N-1:0][31:0] hi;
|
||||
logic [100-1:0][31:0] x;
|
||||
int unsigned n;
|
||||
} config_struct;
|
||||
|
||||
function automatic logic subcheck(logic[31:0] lo, logic[31:0] hi, logic[31:0] val);
|
||||
return lo <= val && val < hi;
|
||||
endfunction
|
||||
|
||||
function automatic logic check(config_struct cfg, logic[31:0] val);
|
||||
logic[N-1:0] good = '0;
|
||||
logic[N-1:0] bad = '0;
|
||||
for (int i = 0; i < cfg.n; i++) begin
|
||||
good[i] = subcheck(cfg.lo[i], cfg.hi[i], val);
|
||||
end
|
||||
for (int i = cfg.n; i < N; i++) begin
|
||||
bad[i] = !(cfg.lo[i] == '0 && cfg.hi[i] == '0);
|
||||
end
|
||||
return good != '0 && bad == '0;
|
||||
endfunction
|
||||
|
||||
endpackage : config_pkg
|
||||
|
||||
module t(/*AUTOARG*/
|
||||
// Inputs
|
||||
clk
|
||||
);
|
||||
|
||||
input clk;
|
||||
import config_pkg::*;
|
||||
|
||||
parameter config_struct MY_CONFIG = '{
|
||||
lo: {((N-3)*32)'('0), 32'h00, 32'h10, 32'h20},
|
||||
hi: {((N-3)*32)'('0), 32'h10, 32'h20, 32'h30},
|
||||
x : 3200'h0deadbeef,
|
||||
n : 3
|
||||
};
|
||||
|
||||
struct_submodule #(.MY_CONFIG(MY_CONFIG)) a_submodule_I (.clk);
|
||||
endmodule : t
|
||||
|
||||
module struct_submodule
|
||||
import config_pkg::*;
|
||||
#(
|
||||
parameter config_struct MY_CONFIG = '0
|
||||
) (
|
||||
input clk
|
||||
);
|
||||
|
||||
logic [31:0] val;
|
||||
logic c;
|
||||
int count = 0;
|
||||
|
||||
assign val = 3;
|
||||
assign c = check(MY_CONFIG, count);
|
||||
|
||||
always @(posedge clk) begin
|
||||
count <= count + 1;
|
||||
if (c != '1) begin
|
||||
$error("c not 1");
|
||||
$stop;
|
||||
end
|
||||
if (count >= 10) begin
|
||||
$write("*-* All Finished *-*\n");
|
||||
$finish;
|
||||
end
|
||||
end
|
||||
|
||||
endmodule : struct_submodule
|
||||
Loading…
Reference in New Issue
Block a user