diff options
author | jjsuperpower <jjs29356@gmail.com> | 2022-06-26 09:40:18 -0500 |
---|---|---|
committer | jjsuperpower <jjs29356@gmail.com> | 2022-06-26 09:40:18 -0500 |
commit | 987134966d0c3ab9b1a5775c8f01fa707408780b (patch) | |
tree | 47547791b41376ee25fd0968724d2e34a4742f60 | |
parent | f4407898d3d74be98cdf1a0308c779cd842364ab (diff) |
restructured folder
-rw-r--r-- | .vscode/configurationCache.log | 1 | ||||
-rw-r--r-- | .vscode/dryrun.log | 6 | ||||
-rw-r--r-- | .vscode/settings.json | 3 | ||||
-rw-r--r-- | .vscode/targets.log | 383 | ||||
-rw-r--r-- | Makefile | 24 | ||||
-rw-r--r-- | hdl/testing/.gitignore | 3 | ||||
-rw-r--r-- | hdl/testing/delme.py | 11 | ||||
-rw-r--r-- | hdl/testing/top.py | 26 | ||||
-rw-r--r-- | hdl_lab/.gitignore | 6 | ||||
-rw-r--r-- | hdl_lab/Makefile (renamed from hdl/testing/Makefile) | 3 | ||||
-rw-r--r-- | hdl_lab/constants.py (renamed from hdl/testing/constants.py) | 0 | ||||
-rw-r--r-- | hdl_lab/hdl/shift_reg.py (renamed from hdl/testing/shift_reg.py) | 0 | ||||
-rwxr-xr-x | hdl_lab/myhdl.vpi (renamed from hdl/testing/myhdl.vpi) | bin | 32216 -> 32216 bytes | |||
-rw-r--r-- | hdl_lab/myhdl_wrap.py (renamed from hdl/testing/myhdl_wrap.py) | 0 |
14 files changed, 401 insertions, 65 deletions
diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log new file mode 100644 index 0000000..bab9054 --- /dev/null +++ b/.vscode/configurationCache.log @@ -0,0 +1 @@ +{"buildTargets":[],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}}
\ No newline at end of file diff --git a/.vscode/dryrun.log b/.vscode/dryrun.log new file mode 100644 index 0000000..927972b --- /dev/null +++ b/.vscode/dryrun.log @@ -0,0 +1,6 @@ +make --dry-run --always-make --keep-going --print-directory +make: Entering directory '/home/jon/Downloads/vertex-isa' +make: Leaving directory '/home/jon/Downloads/vertex-isa' + +make: *** No targets specified and no makefile found. Stop. + diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..65e1ec0 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "makefile.extensionOutputFolder": "./.vscode" +}
\ No newline at end of file diff --git a/.vscode/targets.log b/.vscode/targets.log new file mode 100644 index 0000000..22515f1 --- /dev/null +++ b/.vscode/targets.log @@ -0,0 +1,383 @@ +make all --print-data-base --no-builtin-variables --no-builtin-rules --question +# GNU Make 4.3 +# Built for x86_64-suse-linux-gnu +# Copyright (C) 1988-2020 Free Software Foundation, Inc. +# License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> +# This is free software: you are free to change and redistribute it. +# There is NO WARRANTY, to the extent permitted by law. + +# Make data base, printed on Wed Jun 22 09:25:58 2022 + +# Variables + +# environment +JAVA_HOME = /usr/lib64/jvm/java +# environment +QEMU_AUDIO_DRV = pa +# environment +GDK_BACKEND = x11 +# environment +LC_ALL = C +# environment +NO_AT_BRIDGE = 1 +# environment +GTK_RC_FILES = /etc/gtk/gtkrc:/home/jon/.gtkrc:/home/jon/.config/gtkrc +# environment +VSCODE_IPC_HOOK_EXTHOST = /run/user/1000/vscode-ipc-1d294c6c-3d2e-413d-a467-1ad34d3e6ef7.sock +# environment +WINDOWMANAGER = /usr/bin/startplasma-x11 +# environment +VSCODE_CWD = /home/jon +# environment +GPG_TTY = not a tty +# environment +MACHTYPE = x86_64-suse-linux +# default +MAKE_COMMAND := make +# automatic +@D = $(patsubst %/,%,$(dir $@)) +# environment +PYTHONSTARTUP = /etc/pythonstart +# environment +VSCODE_HANDLES_UNCAUGHT_ERRORS = true +# default +.VARIABLES := +# environment +PWD = /home/jon/Downloads/vertex-isa +# environment +HOST = WarpDrive +# automatic +%D = $(patsubst %/,%,$(dir $%)) +# environment +MORE = -sl +# environment +HOSTNAME = WarpDrive +# environment +MAIL = /var/spool/mail/jon +# environment +XNLSPATH = /usr/share/X11/nls +# environment +XDG_DATA_DIRS = /home/jon/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/share +# automatic +^D = $(patsubst %/,%,$(dir $^)) +# environment +VSCODE_LOG_STACK = false +# environment +QML_XHR_ALLOW_FILE_READ = 1 +# automatic +%F = $(notdir $%) +# environment +VSCODE_CODE_CACHE_PATH = /home/jon/.config/Code/CachedData/dfd34e8260c270da74b5c2d86d61aee4b6d56977 +# environment +XDG_SESSION_PATH = /org/freedesktop/DisplayManager/Session0 +# environment +PROFILEREAD = true +# environment +SSH_ASKPASS = /usr/libexec/ssh/ssh-askpass +# environment +LANG = C +# environment +XAUTHORITY = /run/user/1000/xauth_wDskWU +# environment +MANPATHISSET = yes +# default +.LOADED := +# environment +FROM_HEADER = +# default +.INCLUDE_DIRS = /usr/include /usr/local/include /usr/include +# makefile +MAKEFLAGS = pqrR +# makefile +CURDIR := /home/jon/Downloads/vertex-isa +# environment +VSCODE_PIPE_LOGGING = true +# environment +APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = 1 +# environment +LESSOPEN = lessopen.sh %s +# automatic +*D = $(patsubst %/,%,$(dir $*)) +# environment +MFLAGS = -pqrR +# environment +SSH_AUTH_SOCK = /tmp/ssh-XXXXXX3qXqxT/agent.1648 +# default +.SHELLFLAGS := -c +# environment +HISTSIZE = 1000 +# environment +XDG_CONFIG_DIRS = /home/jon/.config/kdedefaults:/etc/xdg:/usr/etc/xdg +# automatic ++D = $(patsubst %/,%,$(dir $+)) +# environment +XCURSOR_THEME = Qogir-dark +# environment +LESSKEY = /usr/etc/lesskey.bin +# environment +XDG_SESSION_DESKTOP = KDE +# makefile +MAKEFILE_LIST := +# automatic +@F = $(notdir $@) +# environment +VSCODE_VERBOSE_LOGGING = true +# environment +VSCODE_PID = 12064 +# environment +XDG_SESSION_TYPE = x11 +# environment +XAUTHLOCALHOSTNAME = WarpDrive +# automatic +?D = $(patsubst %/,%,$(dir $?)) +# environment +INPUT_METHOD = ibus +# environment +SDK_HOME = /usr/lib64/jvm/java +# environment +SESSION_MANAGER = local/WarpDrive:@/tmp/.ICE-unix/2157,unix/WarpDrive:/tmp/.ICE-unix/2157 +# automatic +*F = $(notdir $*) +# environment +MANPATH = /home/jon/.local/share/man:/usr/local/man:/usr/local/share/man:/usr/share/man:/opt/cross/share/man +# environment +CHROME_DESKTOP = code-url-handler.desktop +# environment +DBUS_SESSION_BUS_ADDRESS = unix:abstract=/tmp/dbus-wAQvM73TPv,guid=5b1fa7134ecbc4a9f950969962b28466 +# automatic +<D = $(patsubst %/,%,$(dir $<)) +# environment +JAVA_ROOT = /usr/lib64/jvm/java +# environment +LESS_ADVANCED_PREPROCESSOR = no +# environment +JAVA_BINDIR = /usr/lib64/jvm/java/bin +# environment +VSCODE_NLS_CONFIG = {"locale":"en-us","availableLanguages":{},"_languagePackSupport":true} +# default +MAKE_HOST := x86_64-suse-linux-gnu +# environment +WINDOW_MANAGER = /usr/bin/startplasma-x11 +# makefile +SHELL = /bin/sh +# default +MAKECMDGOALS := all +# environment +XMODIFIERS = @im=ibus +# environment +PLATFORMIO_CALLER = vscode +# environment +SHLVL = 0 +# environment +MAKELEVEL := 0 +# default +MAKE = $(MAKE_COMMAND) +# environment +PATH = /home/jon/.local/bin:/usr/local/bin:/usr/bin:/bin:/opt/cross/bin +# default +MAKEFILES := +# automatic +^F = $(notdir $^) +# environment +OSTYPE = linux +# environment +QSYS_ROOTDIR = /storage/large_programs/quartus/sopc_builder/bin +# environment +VSCODE_LOG_NATIVE = false +# environment +MINICOM = -c on +# environment +CPU = x86_64 +# environment +LESSCLOSE = lessclose.sh %s %s +# automatic +?F = $(notdir $?) +# environment +KDE_APPLICATIONS_AS_SCOPE = 1 +# environment +XDG_SEAT = seat0 +# environment +XSESSION_IS_UP = yes +# environment +GTK_IM_MODULE = ibus +# environment +NO_PROXY = 127.0.0.1 +# environment +XDG_CURRENT_DESKTOP = KDE +# environment +HOSTTYPE = x86_64 +# environment +LS_COLORS = rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=01;05;37;41:mi=01;05;37;41:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.pdf=00;32:*.ps=00;32:*.txt=00;32:*.patch=00;32:*.diff=00;32:*.log=00;32:*.tex=00;32:*.doc=00;32:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36: +# automatic ++F = $(notdir $+) +# environment +XDG_SEAT_PATH = /org/freedesktop/DisplayManager/Seat0 +# environment +LESS = -M -I -R +# environment +DESKTOP_SESSION = /usr/share/xsessions/default +# environment +CONFIG_SITE = /usr/share/site/x86_64-pc-linux-gnu +# environment +ORIGINAL_XDG_CURRENT_DESKTOP = KDE +# 'override' directive +GNUMAKEFLAGS := +# environment +LOGNAME = jon +# environment +QT_IM_SWITCHER = imsw-multi +# environment +AUDIODRIVER = pulseaudio +# environment +G_FILENAME_ENCODING = @locale,UTF-8,ISO-8859-15,CP1252 +# environment +PLATFORMIO_PATH = /home/jon/.platformio/python3/bin:/home/jon/.local/bin:/usr/local/bin:/usr/bin:/bin:/opt/cross/bin +# environment +XDG_VTNR = 7 +# makefile +.DEFAULT_GOAL := +# environment +DISPLAY = :0 +# environment +GTK_MODULES = canberra-gtk-module:canberra-gtk-module +# environment +USER = jon +# default +MAKE_VERSION := 4.3 +# environment +KDE_SESSION_UID = 1000 +# environment +DEBUGINFOD_URLS = https://debuginfod.opensuse.org/ +# environment +SSH_AGENT_PID = 1825 +# environment +PAGER = less +# environment +_ = /usr/bin/make +# environment +XDG_RUNTIME_DIR = /run/user/1000 +# environment +G_BROKEN_FILENAMES = 1 +# environment +XDG_SESSION_CLASS = user +# environment +VSCODE_AMD_ENTRYPOINT = vs/workbench/api/node/extensionHostProcess +# environment +PLATFORMIO_IDE = 2.4.3 +# environment +XKEYSYMDB = /usr/X11R6/lib/X11/XKeysymDB +# environment +GTK2_RC_FILES = /etc/gtk-2.0/gtkrc:/home/jon/.gtkrc-2.0:/home/jon/.config/gtkrc-2.0 +# environment +HOME = /home/jon +# environment +QT_IM_MODULE = ibus +# environment +CSHEDIT = emacs +# environment +JDK_HOME = /usr/lib64/jvm/java +# environment +ELECTRON_RUN_AS_NODE = 1 +# environment +VSCODE_IPC_HOOK = /run/user/1000/vscode-74f3b1db-1.66.2-main.sock +# environment +TERM = xterm +# environment +XDG_SESSION_ID = 1 + +make: *** No rule to make target 'all'. Stop. + +# environment +XCURSOR_SIZE = 24 +# environment +STARTUP = /usr/bin/startplasma-x11 +# default +.RECIPEPREFIX := +# automatic +<F = $(notdir $<) +# default +SUFFIXES := +# environment +QT_AUTO_SCREEN_SCALE_FACTOR = 0 +# environment +LS_OPTIONS = -N --color=tty -T 0 +# environment +KDE_SESSION_VERSION = 5 +# default +.FEATURES := target-specific order-only second-expansion else-if shortest-stem undefine oneshell nocomment grouped-target extra-prereqs archives jobserver output-sync check-symlink load +# environment +QT4_IM_MODULE = xim +# environment +KDE_FULL_SESSION = true +# environment +JRE_HOME = /usr/lib64/jvm/java +# variable set hash-table stats: +# Load=149/1024=15%, Rehash=0, Collisions=15/176=9% + +# Pattern-specific Variable Values + +# No pattern-specific variable values. + +# Directories + +# . (device 65025, inode 21757987): 7 files, no impossibilities. + +# 7 files, no impossibilities in 1 directories. + +# Implicit Rules + +# No implicit rules. + +# Files + +# Not a target: +Makefile: +# Implicit rule search has been done. +# File does not exist. +# File has been updated. +# Failed to be updated. + +# Not a target: +.DEFAULT: +# Implicit rule search has not been done. +# Modification time never checked. +# File has not been updated. + +# Not a target: +all: +# Command line target. +# Implicit rule search has been done. +# File does not exist. +# File has not been updated. + +# Not a target: +makefile: +# Implicit rule search has been done. +# File does not exist. +# File has been updated. +# Failed to be updated. + +# Not a target: +GNUmakefile: +# Implicit rule search has been done. +# File does not exist. +# File has been updated. +# Failed to be updated. + +# files hash-table stats: +# Load=6/1024=1%, Rehash=0, Collisions=0/15=0% +# VPATH Search Paths + +# No 'vpath' search paths. + +# No general ('VPATH' variable) search path. + +# strcache buffers: 1 (0) / strings = 15 / storage = 122 B / avg = 8 B +# current buf: size = 8162 B / used = 122 B / count = 15 / avg = 8 B + +# strcache performance: lookups = 18 / hit rate = 16% +# hash-table stats: +# Load=15/8192=0%, Rehash=0, Collisions=0/18=0% +# Finished Make data base on Wed Jun 22 09:25:58 2022 + + diff --git a/Makefile b/Makefile deleted file mode 100644 index 98545df..0000000 --- a/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -BOOK:=manual.pdf -SOURCES:=src/*.md -FIGURES:=$(shell find . -name "*.svg") -PFLAGS:=--table-of-contents \ - --pdf-engine=xelatex \ - --from=markdown \ - --number-sections \ - --indented-code-classes=javascript \ - --highlight-style=monochrome \ - -V mainfont="Apple Garamond" \ - -V monofont="FreeMono" \ - -V documentclass=report \ - -V papersize=letter \ - -V geometry:margin=1in - -.PHONY: all clean - -all: $(BOOK) - -$(BOOK): $(SOURCES) src/title.txt $(FIGURES) - pandoc $^ -o $@ $(PFLAGS) - -clean: - $(RM) *.pdf diff --git a/hdl/testing/.gitignore b/hdl/testing/.gitignore deleted file mode 100644 index 2ddc4e7..0000000 --- a/hdl/testing/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -quartus -gen_verilog -simulation
\ No newline at end of file diff --git a/hdl/testing/delme.py b/hdl/testing/delme.py deleted file mode 100644 index 1264357..0000000 --- a/hdl/testing/delme.py +++ /dev/null @@ -1,11 +0,0 @@ -class A(): - def __init__(self): - print(f"Parent Class: {self.__class__}") - -class B(A): - def __init__(self): - super().__init__() - print(f"Child Class: {self.__class__}") - - -b = B()
\ No newline at end of file diff --git a/hdl/testing/top.py b/hdl/testing/top.py deleted file mode 100644 index 72e14cd..0000000 --- a/hdl/testing/top.py +++ /dev/null @@ -1,26 +0,0 @@ -from myhdl import * -from constants import GEN_VERILOG -from shift_reg import ShiftReg - -logic = ShiftReg.ShiftReg - -@block -def top(clk, reset, in0, out0): - - node = Signal(modbv(0)[8:]) - - sr0 = logic(clk=clk, reset=reset, in0=in0, out0=node) - sr1 = logic(clk=clk, reset=reset, in0=node(7), out0=out0) - - return sr0, sr1 - -def convert(): - reset = ResetSignal(0, 0, True) - clk = Signal(bool(0)) - in0 = Signal(bool(0)) - out0 = Signal(modbv(0)[8:]) - - inst = top(reset=reset, clk=clk, in0=in0, out0=out0) - inst.convert(hdl='Verilog', path=GEN_VERILOG) - -convert()
\ No newline at end of file diff --git a/hdl_lab/.gitignore b/hdl_lab/.gitignore new file mode 100644 index 0000000..bae8235 --- /dev/null +++ b/hdl_lab/.gitignore @@ -0,0 +1,6 @@ +quartus +gen_verilog +simulation +.vscode +__pycache__ +.pytest_cache
\ No newline at end of file diff --git a/hdl/testing/Makefile b/hdl_lab/Makefile index 5e6391c..c40b1cf 100644 --- a/hdl/testing/Makefile +++ b/hdl_lab/Makefile @@ -1,5 +1,6 @@ -HDL = shift_reg.py +HDL_FOLDER = ./hdl +HDL = $(wildcard $(HDL_FOLDER)/*.py) test: diff --git a/hdl/testing/constants.py b/hdl_lab/constants.py index d40d7c1..d40d7c1 100644 --- a/hdl/testing/constants.py +++ b/hdl_lab/constants.py diff --git a/hdl/testing/shift_reg.py b/hdl_lab/hdl/shift_reg.py index 28914f1..28914f1 100644 --- a/hdl/testing/shift_reg.py +++ b/hdl_lab/hdl/shift_reg.py diff --git a/hdl/testing/myhdl.vpi b/hdl_lab/myhdl.vpi Binary files differindex 1b9d393..1b9d393 100755 --- a/hdl/testing/myhdl.vpi +++ b/hdl_lab/myhdl.vpi diff --git a/hdl/testing/myhdl_wrap.py b/hdl_lab/myhdl_wrap.py index 2e8fe4e..2e8fe4e 100644 --- a/hdl/testing/myhdl_wrap.py +++ b/hdl_lab/myhdl_wrap.py |