derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Move the bytesToCppArray helper to gem5_scons.util.

Browse Source 
Change-Id: Ib8789dd33ebbfb8e10446de5d1079654a2200d2d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/48377
Reviewed-by: Hoa Nguyen <hoanguyen@ucdavis.edu>
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
This commit is contained in:
Gabe Black
2021-07-20 01:57:48 -07:00
parent b61f539f05
commit 88a932522d
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
site_scons/gem5_scons/util.py
View File

@@ -38,6 +38,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import array
import functools
import itertools import itertools
import re import re
import sys import sys
@@ -109,3 +111,17 @@ def compareVersions(v1, v2):
if n1 > n2: return 1 if n1 > n2: return 1
return 0 return 0
def bytesToCppArray(code, symbol, data):
'''
Output an array of bytes to a code formatter as a c++ array declaration.
'''
code('const std::uint8_t ${symbol}[] = {')
code.indent()
step = 16
for i in range(0, len(data), step):
x = array.array('B', data[i:i+step])
strs = map(lambda i: f'{i},', x)
code(functools.reduce(lambda x, y: x + y, strs))
code.dedent()
code('};')

17
src/SConscript
View File

@@ -37,10 +37,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import array
import bisect import bisect
import distutils.spawn import distutils.spawn
import functools
import importlib import importlib
import importlib.abc import importlib.abc
import importlib.machinery import importlib.machinery
@@ -55,6 +53,7 @@ import SCons
from gem5_scons import Transform, warning, error, ToValue, FromValue from gem5_scons import Transform, warning, error, ToValue, FromValue
from gem5_scons.sources import * from gem5_scons.sources import *
from gem5_scons.util import bytesToCppArray
Export(SourceFilter.factories) Export(SourceFilter.factories)
@@ -70,20 +69,6 @@ build_env = [(opt, env[opt]) for opt in export_vars]
from m5.util import code_formatter from m5.util import code_formatter
def bytesToCppArray(code, symbol, data):
'''
Output an array of bytes to a code formatter as a c++ array declaration.
'''
code('const std::uint8_t ${symbol}[] = {')
code.indent()
step = 16
for i in range(0, len(data), step):
x = array.array('B', data[i:i + step])
strs = map(lambda i: f'{i},', x)
code(functools.reduce(lambda x, y: x + y, strs))
code.dedent()
code('};')
def build_blob(target, source, env): def build_blob(target, source, env):
''' '''
Embed an arbitrary blob into the gem5 executable, Embed an arbitrary blob into the gem5 executable,