Compare commits
16 Commits
dev
...
mpabi-sort
| Author | SHA1 | Date |
|---|---|---|
 mpabi
|
3396867a11 | |
|
mpabi
|
c54b4ce2eb | |
|
mpabi
|
ff66e2ef5d | |
|
mpabi
|
7bf09994cf | |
|
mpabi
|
d9e57e8ca0 | |
|
mpabi
|
a0f7585ae1 | |
|
mpabi
|
fa96a5d3b9 | |
|
mpabi
|
cdb06c4c44 | |
|
mpabi
|
ea8abde781 | |
|
mpabi
|
10c1866b33 | |
|
mpabi
|
a7089d248f | |
 borysr
|
f8380b5835 | |
|
mpabi
|
8190fc9684 | |
|
mpabi
|
809f1e4004 | |
|
mpabi
|
bd1371a214 | |
|
mpabi
|
40373170ac |
16
conf.json
16
conf.json
|
|
@ -1,16 +0,0 @@
|
||||||
{
|
|
||||||
"user": "borysr",
|
|
||||||
"email": "borysr@gmail.com",
|
|
||||||
"remotes": [
|
|
||||||
{
|
|
||||||
"name": "r",
|
|
||||||
"protocol": "http",
|
|
||||||
"domain": "qstack.pl",
|
|
||||||
"port": "3000",
|
|
||||||
"token_name": "t",
|
|
||||||
"token": "8ee3f1b7980197aeceadee3cf4d980f817d44f06",
|
|
||||||
"group": "1i-2023",
|
|
||||||
"project": "homework"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,81 +0,0 @@
|
||||||
|
|
||||||
ARCH=riscv64-unknown-elf
|
|
||||||
GNU_DIR=$(HOME)/riscv/riscv/
|
|
||||||
GNU_BIN=$(GNU_DIR)/bin
|
|
||||||
|
|
||||||
|
|
||||||
CC=$(GNU_BIN)/$(ARCH)-gcc
|
|
||||||
CXX=$(GNU_BIN)/$(ARCH)-g++
|
|
||||||
AS=$(GNU_BIN)/$(ARCH)-as
|
|
||||||
LD=$(GNU_BIN)/$(ARCH)-ld
|
|
||||||
OBJCOPY=$(GNU_BIN)/$(ARCH)-objcopy
|
|
||||||
OBJDUMP=$(GNU_BIN)/$(ARCH)-objdump
|
|
||||||
SIZE=$(GNU_BIN)/$(ARCH)-size
|
|
||||||
AR=$(GNU_BIN)/$(ARCH)-ar
|
|
||||||
RANLIB=$(GNU_BIN)/$(ARCH)-ranlib
|
|
||||||
|
|
||||||
|
|
||||||
CFLAGS+=-ffreestanding
|
|
||||||
CFLAGS+=-fno-pic
|
|
||||||
CFLAGS+=-march=rv32i -mabi=ilp32
|
|
||||||
CFLAGS+= -g
|
|
||||||
|
|
||||||
|
|
||||||
LDFLAGS+=-nostdlib
|
|
||||||
LDFLAGS+=-Wl,-Ttext=0x00000000
|
|
||||||
|
|
||||||
# see: https://github.com/riscv/riscv-gcc/issues/120
|
|
||||||
#LDFLAGS+=-Wl,--no-relax
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ASFLAGS+=$(CFLAGS)
|
|
||||||
CXXFLAGS+=$(CFLAGS)
|
|
||||||
|
|
||||||
CLEAN_DIRS=$(SUBDIRS:%=clean-%)
|
|
||||||
ALL_DIRS=$(SUBDIRS:%=all-%)
|
|
||||||
|
|
||||||
OBJDUMPFLAGS+=-Mnumeric,no-aliases
|
|
||||||
|
|
||||||
.PHONY: all clean world $(CLEAN_DIRS) $(ALL_DIRS)
|
|
||||||
|
|
||||||
|
|
||||||
%.bin : %
|
|
||||||
$(OBJCOPY) $< -O binary $@
|
|
||||||
|
|
||||||
%.lst : %
|
|
||||||
$(OBJDUMP) $(OBJDUMPFLAGS) -dr --disassemble-all $< > $<.lst
|
|
||||||
|
|
||||||
% : %.o
|
|
||||||
$(LINK.cc) $(LDFLAGS) -o $@ $^ $(LDLIBS)
|
|
||||||
$(SIZE) -x -A $@
|
|
||||||
|
|
||||||
%.s: %.c
|
|
||||||
$(COMPILE.c) -S -o $@ $<
|
|
||||||
|
|
||||||
%.s: %.cc
|
|
||||||
$(COMPILE.cc) -S -o $@ $<
|
|
||||||
|
|
||||||
%.o: %.c
|
|
||||||
$(COMPILE.c) -o $@ $<
|
|
||||||
|
|
||||||
%.o: %.cc
|
|
||||||
$(COMPILE.cc) -o $@ $<
|
|
||||||
|
|
||||||
%.srec: %
|
|
||||||
$(OBJCOPY) $< -O srec $@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
all:: $(ALL_DIRS)
|
|
||||||
|
|
||||||
clean:: $(CLEAN_DIRS)
|
|
||||||
|
|
||||||
$(ALL_DIRS)::
|
|
||||||
$(MAKE) -C $(@:all-%=%) all
|
|
||||||
|
|
||||||
$(CLEAN_DIRS)::
|
|
||||||
$(MAKE) -C $(@:clean-%=%) clean
|
|
||||||
|
|
||||||
world:: clean all
|
|
||||||
543
cpp/Murax.scala
543
cpp/Murax.scala
|
|
@ -1,543 +0,0 @@
|
||||||
package vexriscv.demo
|
|
||||||
|
|
||||||
import spinal.core._
|
|
||||||
import spinal.lib._
|
|
||||||
import spinal.lib.bus.amba3.apb._
|
|
||||||
import spinal.lib.bus.misc.SizeMapping
|
|
||||||
import spinal.lib.bus.simple.PipelinedMemoryBus
|
|
||||||
import spinal.lib.com.jtag.Jtag
|
|
||||||
import spinal.lib.com.spi.ddr.SpiXdrMaster
|
|
||||||
import spinal.lib.com.uart._
|
|
||||||
import spinal.lib.io.{InOutWrapper, TriStateArray}
|
|
||||||
import spinal.lib.misc.{InterruptCtrl, Prescaler, Timer}
|
|
||||||
import spinal.lib.soc.pinsec.{PinsecTimerCtrl, PinsecTimerCtrlExternal}
|
|
||||||
import vexriscv.plugin._
|
|
||||||
import vexriscv.{VexRiscv, VexRiscvConfig, plugin}
|
|
||||||
import spinal.lib.com.spi.ddr._
|
|
||||||
import spinal.lib.bus.simple._
|
|
||||||
import scala.collection.mutable.ArrayBuffer
|
|
||||||
import scala.collection.Seq
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by PIC32F_USER on 28/07/2017.
|
|
||||||
*
|
|
||||||
* Murax is a very light SoC which could work without any external component.
|
|
||||||
* - ICE40-hx8k + icestorm => 53 Mhz, 2142 LC
|
|
||||||
* - 0.37 DMIPS/Mhz
|
|
||||||
* - 8 kB of on-chip ram
|
|
||||||
* - JTAG debugger (eclipse/GDB/openocd ready)
|
|
||||||
* - Interrupt support
|
|
||||||
* - APB bus for peripherals
|
|
||||||
* - 32 GPIO pin
|
|
||||||
* - one 16 bits prescaler, two 16 bits timers
|
|
||||||
* - one UART with tx/rx fifo
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
case class MuraxConfig(coreFrequency : HertzNumber,
|
|
||||||
onChipRamSize : BigInt,
|
|
||||||
onChipRamHexFile : String,
|
|
||||||
pipelineDBus : Boolean,
|
|
||||||
pipelineMainBus : Boolean,
|
|
||||||
pipelineApbBridge : Boolean,
|
|
||||||
gpioWidth : Int,
|
|
||||||
uartCtrlConfig : UartCtrlMemoryMappedConfig,
|
|
||||||
xipConfig : SpiXdrMasterCtrl.MemoryMappingParameters,
|
|
||||||
hardwareBreakpointCount : Int,
|
|
||||||
cpuPlugins : ArrayBuffer[Plugin[VexRiscv]]){
|
|
||||||
require(pipelineApbBridge || pipelineMainBus, "At least pipelineMainBus or pipelineApbBridge should be enable to avoid wipe transactions")
|
|
||||||
val genXip = xipConfig != null
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
object MuraxConfig{
|
|
||||||
def default : MuraxConfig = default(false, false)
|
|
||||||
def default(withXip : Boolean = false, bigEndian : Boolean = false) = MuraxConfig(
|
|
||||||
coreFrequency = 12 MHz,
|
|
||||||
onChipRamSize = 128 kB,
|
|
||||||
onChipRamHexFile = null,
|
|
||||||
pipelineDBus = true,
|
|
||||||
pipelineMainBus = false,
|
|
||||||
pipelineApbBridge = true,
|
|
||||||
gpioWidth = 32,
|
|
||||||
xipConfig = ifGen(withXip) (SpiXdrMasterCtrl.MemoryMappingParameters(
|
|
||||||
SpiXdrMasterCtrl.Parameters(8, 12, SpiXdrParameter(2, 2, 1)).addFullDuplex(0,1,false),
|
|
||||||
cmdFifoDepth = 32,
|
|
||||||
rspFifoDepth = 32,
|
|
||||||
xip = SpiXdrMasterCtrl.XipBusParameters(addressWidth = 24, lengthWidth = 2)
|
|
||||||
)),
|
|
||||||
hardwareBreakpointCount = if(withXip) 3 else 0,
|
|
||||||
cpuPlugins = ArrayBuffer( //DebugPlugin added by the toplevel
|
|
||||||
new IBusSimplePlugin(
|
|
||||||
resetVector = if(withXip) 0xF001E000l else 0x00000000l,
|
|
||||||
cmdForkOnSecondStage = true,
|
|
||||||
cmdForkPersistence = withXip, //Required by the Xip controller
|
|
||||||
prediction = NONE,
|
|
||||||
catchAccessFault = false,
|
|
||||||
compressedGen = false,
|
|
||||||
bigEndian = bigEndian
|
|
||||||
),
|
|
||||||
new DBusSimplePlugin(
|
|
||||||
catchAddressMisaligned = false,
|
|
||||||
catchAccessFault = false,
|
|
||||||
earlyInjection = false,
|
|
||||||
bigEndian = bigEndian
|
|
||||||
),
|
|
||||||
new CsrPlugin(CsrPluginConfig.smallest(mtvecInit = if(withXip) 0xE0040020l else 0x00000020l)),
|
|
||||||
new DecoderSimplePlugin(
|
|
||||||
catchIllegalInstruction = false
|
|
||||||
),
|
|
||||||
new RegFilePlugin(
|
|
||||||
regFileReadyKind = plugin.SYNC,
|
|
||||||
zeroBoot = false
|
|
||||||
),
|
|
||||||
new IntAluPlugin,
|
|
||||||
new SrcPlugin(
|
|
||||||
separatedAddSub = false,
|
|
||||||
executeInsertion = false
|
|
||||||
),
|
|
||||||
new LightShifterPlugin,
|
|
||||||
new HazardSimplePlugin(
|
|
||||||
bypassExecute = false,
|
|
||||||
bypassMemory = false,
|
|
||||||
bypassWriteBack = false,
|
|
||||||
bypassWriteBackBuffer = false,
|
|
||||||
pessimisticUseSrc = false,
|
|
||||||
pessimisticWriteRegFile = false,
|
|
||||||
pessimisticAddressMatch = false
|
|
||||||
),
|
|
||||||
new BranchPlugin(
|
|
||||||
earlyBranch = false,
|
|
||||||
catchAddressMisaligned = false
|
|
||||||
),
|
|
||||||
new YamlPlugin("cpu0.yaml")
|
|
||||||
),
|
|
||||||
uartCtrlConfig = UartCtrlMemoryMappedConfig(
|
|
||||||
uartCtrlConfig = UartCtrlGenerics(
|
|
||||||
dataWidthMax = 8,
|
|
||||||
clockDividerWidth = 20,
|
|
||||||
preSamplingSize = 1,
|
|
||||||
samplingSize = 3,
|
|
||||||
postSamplingSize = 1
|
|
||||||
),
|
|
||||||
initConfig = UartCtrlInitConfig(
|
|
||||||
baudrate = 115200,
|
|
||||||
dataLength = 7, //7 => 8 bits
|
|
||||||
parity = UartParityType.NONE,
|
|
||||||
stop = UartStopType.ONE
|
|
||||||
),
|
|
||||||
busCanWriteClockDividerConfig = false,
|
|
||||||
busCanWriteFrameConfig = false,
|
|
||||||
txFifoDepth = 16,
|
|
||||||
rxFifoDepth = 16
|
|
||||||
)
|
|
||||||
|
|
||||||
)
|
|
||||||
|
|
||||||
def fast = {
|
|
||||||
val config = default
|
|
||||||
|
|
||||||
//Replace HazardSimplePlugin to get datapath bypass
|
|
||||||
config.cpuPlugins(config.cpuPlugins.indexWhere(_.isInstanceOf[HazardSimplePlugin])) = new HazardSimplePlugin(
|
|
||||||
bypassExecute = true,
|
|
||||||
bypassMemory = true,
|
|
||||||
bypassWriteBack = true,
|
|
||||||
bypassWriteBackBuffer = true
|
|
||||||
)
|
|
||||||
// config.cpuPlugins(config.cpuPlugins.indexWhere(_.isInstanceOf[LightShifterPlugin])) = new FullBarrelShifterPlugin()
|
|
||||||
|
|
||||||
config
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
case class Murax(config : MuraxConfig) extends Component{
|
|
||||||
import config._
|
|
||||||
|
|
||||||
val io = new Bundle {
|
|
||||||
//Clocks / reset
|
|
||||||
val asyncReset = in Bool()
|
|
||||||
val mainClk = in Bool()
|
|
||||||
|
|
||||||
//Main components IO
|
|
||||||
val jtag = slave(Jtag())
|
|
||||||
|
|
||||||
//Peripherals IO
|
|
||||||
val gpioA = master(TriStateArray(gpioWidth bits))
|
|
||||||
val uart = master(Uart())
|
|
||||||
|
|
||||||
val xip = ifGen(genXip)(master(SpiXdrMaster(xipConfig.ctrl.spi)))
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
val resetCtrlClockDomain = ClockDomain(
|
|
||||||
clock = io.mainClk,
|
|
||||||
config = ClockDomainConfig(
|
|
||||||
resetKind = BOOT
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
val resetCtrl = new ClockingArea(resetCtrlClockDomain) {
|
|
||||||
val mainClkResetUnbuffered = False
|
|
||||||
|
|
||||||
//Implement an counter to keep the reset axiResetOrder high 64 cycles
|
|
||||||
// Also this counter will automatically do a reset when the system boot.
|
|
||||||
val systemClkResetCounter = Reg(UInt(6 bits)) init(0)
|
|
||||||
when(systemClkResetCounter =/= U(systemClkResetCounter.range -> true)){
|
|
||||||
systemClkResetCounter := systemClkResetCounter + 1
|
|
||||||
mainClkResetUnbuffered := True
|
|
||||||
}
|
|
||||||
when(BufferCC(io.asyncReset)){
|
|
||||||
systemClkResetCounter := 0
|
|
||||||
}
|
|
||||||
|
|
||||||
//Create all reset used later in the design
|
|
||||||
val mainClkReset = RegNext(mainClkResetUnbuffered)
|
|
||||||
val systemReset = RegNext(mainClkResetUnbuffered)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
val systemClockDomain = ClockDomain(
|
|
||||||
clock = io.mainClk,
|
|
||||||
reset = resetCtrl.systemReset,
|
|
||||||
frequency = FixedFrequency(coreFrequency)
|
|
||||||
)
|
|
||||||
|
|
||||||
val debugClockDomain = ClockDomain(
|
|
||||||
clock = io.mainClk,
|
|
||||||
reset = resetCtrl.mainClkReset,
|
|
||||||
frequency = FixedFrequency(coreFrequency)
|
|
||||||
)
|
|
||||||
|
|
||||||
val system = new ClockingArea(systemClockDomain) {
|
|
||||||
val pipelinedMemoryBusConfig = PipelinedMemoryBusConfig(
|
|
||||||
addressWidth = 32,
|
|
||||||
dataWidth = 32
|
|
||||||
)
|
|
||||||
|
|
||||||
val bigEndianDBus = config.cpuPlugins.exists(_ match{ case plugin : DBusSimplePlugin => plugin.bigEndian case _ => false})
|
|
||||||
|
|
||||||
//Arbiter of the cpu dBus/iBus to drive the mainBus
|
|
||||||
//Priority to dBus, !! cmd transactions can change on the fly !!
|
|
||||||
val mainBusArbiter = new MuraxMasterArbiter(pipelinedMemoryBusConfig, bigEndianDBus)
|
|
||||||
|
|
||||||
//Instanciate the CPU
|
|
||||||
val cpu = new VexRiscv(
|
|
||||||
config = VexRiscvConfig(
|
|
||||||
plugins = cpuPlugins += new DebugPlugin(debugClockDomain, hardwareBreakpointCount)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
//Checkout plugins used to instanciate the CPU to connect them to the SoC
|
|
||||||
val timerInterrupt = False
|
|
||||||
val externalInterrupt = False
|
|
||||||
for(plugin <- cpu.plugins) plugin match{
|
|
||||||
case plugin : IBusSimplePlugin =>
|
|
||||||
mainBusArbiter.io.iBus.cmd <> plugin.iBus.cmd
|
|
||||||
mainBusArbiter.io.iBus.rsp <> plugin.iBus.rsp
|
|
||||||
case plugin : DBusSimplePlugin => {
|
|
||||||
if(!pipelineDBus)
|
|
||||||
mainBusArbiter.io.dBus <> plugin.dBus
|
|
||||||
else {
|
|
||||||
mainBusArbiter.io.dBus.cmd << plugin.dBus.cmd.halfPipe()
|
|
||||||
mainBusArbiter.io.dBus.rsp <> plugin.dBus.rsp
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case plugin : CsrPlugin => {
|
|
||||||
plugin.externalInterrupt := externalInterrupt
|
|
||||||
plugin.timerInterrupt := timerInterrupt
|
|
||||||
}
|
|
||||||
case plugin : DebugPlugin => plugin.debugClockDomain{
|
|
||||||
resetCtrl.systemReset setWhen(RegNext(plugin.io.resetOut))
|
|
||||||
io.jtag <> plugin.io.bus.fromJtag()
|
|
||||||
}
|
|
||||||
case _ =>
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//****** MainBus slaves ********
|
|
||||||
val mainBusMapping = ArrayBuffer[(PipelinedMemoryBus,SizeMapping)]()
|
|
||||||
val ram = new MuraxPipelinedMemoryBusRam(
|
|
||||||
onChipRamSize = onChipRamSize,
|
|
||||||
onChipRamHexFile = onChipRamHexFile,
|
|
||||||
pipelinedMemoryBusConfig = pipelinedMemoryBusConfig,
|
|
||||||
bigEndian = bigEndianDBus
|
|
||||||
)
|
|
||||||
mainBusMapping += ram.io.bus -> (0x00000000l, onChipRamSize)
|
|
||||||
|
|
||||||
val apbBridge = new PipelinedMemoryBusToApbBridge(
|
|
||||||
apb3Config = Apb3Config(
|
|
||||||
addressWidth = 20,
|
|
||||||
dataWidth = 32
|
|
||||||
),
|
|
||||||
pipelineBridge = pipelineApbBridge,
|
|
||||||
pipelinedMemoryBusConfig = pipelinedMemoryBusConfig
|
|
||||||
)
|
|
||||||
mainBusMapping += apbBridge.io.pipelinedMemoryBus -> (0xF0000000l, 1 MB)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//******** APB peripherals *********
|
|
||||||
val apbMapping = ArrayBuffer[(Apb3, SizeMapping)]()
|
|
||||||
val gpioACtrl = Apb3Gpio(gpioWidth = gpioWidth, withReadSync = true)
|
|
||||||
io.gpioA <> gpioACtrl.io.gpio
|
|
||||||
apbMapping += gpioACtrl.io.apb -> (0x00000, 4 kB)
|
|
||||||
|
|
||||||
val uartCtrl = Apb3UartCtrl(uartCtrlConfig)
|
|
||||||
uartCtrl.io.uart <> io.uart
|
|
||||||
externalInterrupt setWhen(uartCtrl.io.interrupt)
|
|
||||||
apbMapping += uartCtrl.io.apb -> (0x10000, 4 kB)
|
|
||||||
|
|
||||||
val timer = new MuraxApb3Timer()
|
|
||||||
timerInterrupt setWhen(timer.io.interrupt)
|
|
||||||
apbMapping += timer.io.apb -> (0x20000, 4 kB)
|
|
||||||
|
|
||||||
val xip = ifGen(genXip)(new Area{
|
|
||||||
val ctrl = Apb3SpiXdrMasterCtrl(xipConfig)
|
|
||||||
ctrl.io.spi <> io.xip
|
|
||||||
externalInterrupt setWhen(ctrl.io.interrupt)
|
|
||||||
apbMapping += ctrl.io.apb -> (0x1F000, 4 kB)
|
|
||||||
|
|
||||||
val accessBus = new PipelinedMemoryBus(PipelinedMemoryBusConfig(24,32))
|
|
||||||
mainBusMapping += accessBus -> (0xE0000000l, 16 MB)
|
|
||||||
|
|
||||||
ctrl.io.xip.fromPipelinedMemoryBus() << accessBus
|
|
||||||
val bootloader = Apb3Rom("src/main/c/murax/xipBootloader/crt.bin")
|
|
||||||
apbMapping += bootloader.io.apb -> (0x1E000, 4 kB)
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//******** Memory mappings *********
|
|
||||||
val apbDecoder = Apb3Decoder(
|
|
||||||
master = apbBridge.io.apb,
|
|
||||||
slaves = apbMapping.toSeq
|
|
||||||
)
|
|
||||||
|
|
||||||
val mainBusDecoder = new Area {
|
|
||||||
val logic = new MuraxPipelinedMemoryBusDecoder(
|
|
||||||
master = mainBusArbiter.io.masterBus,
|
|
||||||
specification = mainBusMapping.toSeq,
|
|
||||||
pipelineMaster = pipelineMainBus
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
object Murax{
|
|
||||||
def main(args: Array[String]) {
|
|
||||||
SpinalVerilog(Murax(MuraxConfig.default))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
object MuraxCfu{
|
|
||||||
def main(args: Array[String]) {
|
|
||||||
SpinalVerilog{
|
|
||||||
val config = MuraxConfig.default
|
|
||||||
config.cpuPlugins += new CfuPlugin(
|
|
||||||
stageCount = 1,
|
|
||||||
allowZeroLatency = true,
|
|
||||||
encodings = List(
|
|
||||||
CfuPluginEncoding (
|
|
||||||
instruction = M"-------------------------0001011",
|
|
||||||
functionId = List(14 downto 12),
|
|
||||||
input2Kind = CfuPlugin.Input2Kind.RS
|
|
||||||
)
|
|
||||||
),
|
|
||||||
busParameter = CfuBusParameter(
|
|
||||||
CFU_VERSION = 0,
|
|
||||||
CFU_INTERFACE_ID_W = 0,
|
|
||||||
CFU_FUNCTION_ID_W = 3,
|
|
||||||
CFU_REORDER_ID_W = 0,
|
|
||||||
CFU_REQ_RESP_ID_W = 0,
|
|
||||||
CFU_INPUTS = 2,
|
|
||||||
CFU_INPUT_DATA_W = 32,
|
|
||||||
CFU_OUTPUTS = 1,
|
|
||||||
CFU_OUTPUT_DATA_W = 32,
|
|
||||||
CFU_FLOW_REQ_READY_ALWAYS = false,
|
|
||||||
CFU_FLOW_RESP_READY_ALWAYS = false,
|
|
||||||
CFU_WITH_STATUS = true,
|
|
||||||
CFU_RAW_INSN_W = 32,
|
|
||||||
CFU_CFU_ID_W = 4,
|
|
||||||
CFU_STATE_INDEX_NUM = 5
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
val toplevel = Murax(config)
|
|
||||||
|
|
||||||
toplevel.rework {
|
|
||||||
for (plugin <- toplevel.system.cpu.plugins) plugin match {
|
|
||||||
case plugin: CfuPlugin => plugin.bus.toIo().setName("miaou")
|
|
||||||
case _ =>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
toplevel
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
object Murax_iCE40_hx8k_breakout_board_xip{
|
|
||||||
|
|
||||||
case class SB_GB() extends BlackBox{
|
|
||||||
val USER_SIGNAL_TO_GLOBAL_BUFFER = in Bool()
|
|
||||||
val GLOBAL_BUFFER_OUTPUT = out Bool()
|
|
||||||
}
|
|
||||||
|
|
||||||
case class SB_IO_SCLK() extends BlackBox{
|
|
||||||
addGeneric("PIN_TYPE", B"010000")
|
|
||||||
val PACKAGE_PIN = out Bool()
|
|
||||||
val OUTPUT_CLK = in Bool()
|
|
||||||
val CLOCK_ENABLE = in Bool()
|
|
||||||
val D_OUT_0 = in Bool()
|
|
||||||
val D_OUT_1 = in Bool()
|
|
||||||
setDefinitionName("SB_IO")
|
|
||||||
}
|
|
||||||
|
|
||||||
case class SB_IO_DATA() extends BlackBox{
|
|
||||||
addGeneric("PIN_TYPE", B"110000")
|
|
||||||
val PACKAGE_PIN = inout(Analog(Bool))
|
|
||||||
val CLOCK_ENABLE = in Bool()
|
|
||||||
val INPUT_CLK = in Bool()
|
|
||||||
val OUTPUT_CLK = in Bool()
|
|
||||||
val OUTPUT_ENABLE = in Bool()
|
|
||||||
val D_OUT_0 = in Bool()
|
|
||||||
val D_OUT_1 = in Bool()
|
|
||||||
val D_IN_0 = out Bool()
|
|
||||||
val D_IN_1 = out Bool()
|
|
||||||
setDefinitionName("SB_IO")
|
|
||||||
}
|
|
||||||
|
|
||||||
case class Murax_iCE40_hx8k_breakout_board_xip() extends Component{
|
|
||||||
val io = new Bundle {
|
|
||||||
val mainClk = in Bool()
|
|
||||||
val jtag_tck = in Bool()
|
|
||||||
val jtag_tdi = in Bool()
|
|
||||||
val jtag_tdo = out Bool()
|
|
||||||
val jtag_tms = in Bool()
|
|
||||||
val uart_txd = out Bool()
|
|
||||||
val uart_rxd = in Bool()
|
|
||||||
|
|
||||||
val mosi = inout(Analog(Bool))
|
|
||||||
val miso = inout(Analog(Bool))
|
|
||||||
val sclk = out Bool()
|
|
||||||
val spis = out Bool()
|
|
||||||
|
|
||||||
val led = out Bits(8 bits)
|
|
||||||
}
|
|
||||||
val murax = Murax(MuraxConfig.default(withXip = true).copy(onChipRamSize = 8 kB))
|
|
||||||
murax.io.asyncReset := False
|
|
||||||
|
|
||||||
val mainClkBuffer = SB_GB()
|
|
||||||
mainClkBuffer.USER_SIGNAL_TO_GLOBAL_BUFFER <> io.mainClk
|
|
||||||
mainClkBuffer.GLOBAL_BUFFER_OUTPUT <> murax.io.mainClk
|
|
||||||
|
|
||||||
val jtagClkBuffer = SB_GB()
|
|
||||||
jtagClkBuffer.USER_SIGNAL_TO_GLOBAL_BUFFER <> io.jtag_tck
|
|
||||||
jtagClkBuffer.GLOBAL_BUFFER_OUTPUT <> murax.io.jtag.tck
|
|
||||||
|
|
||||||
io.led <> murax.io.gpioA.write(7 downto 0)
|
|
||||||
|
|
||||||
murax.io.jtag.tdi <> io.jtag_tdi
|
|
||||||
murax.io.jtag.tdo <> io.jtag_tdo
|
|
||||||
murax.io.jtag.tms <> io.jtag_tms
|
|
||||||
murax.io.gpioA.read <> 0
|
|
||||||
murax.io.uart.txd <> io.uart_txd
|
|
||||||
murax.io.uart.rxd <> io.uart_rxd
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
val xip = new ClockingArea(murax.systemClockDomain) {
|
|
||||||
RegNext(murax.io.xip.ss.asBool) <> io.spis
|
|
||||||
|
|
||||||
val sclkIo = SB_IO_SCLK()
|
|
||||||
sclkIo.PACKAGE_PIN <> io.sclk
|
|
||||||
sclkIo.CLOCK_ENABLE := True
|
|
||||||
|
|
||||||
sclkIo.OUTPUT_CLK := ClockDomain.current.readClockWire
|
|
||||||
sclkIo.D_OUT_0 <> murax.io.xip.sclk.write(0)
|
|
||||||
sclkIo.D_OUT_1 <> RegNext(murax.io.xip.sclk.write(1))
|
|
||||||
|
|
||||||
val datas = for ((data, pin) <- (murax.io.xip.data, List(io.mosi, io.miso)).zipped) yield new Area {
|
|
||||||
val dataIo = SB_IO_DATA()
|
|
||||||
dataIo.PACKAGE_PIN := pin
|
|
||||||
dataIo.CLOCK_ENABLE := True
|
|
||||||
|
|
||||||
dataIo.OUTPUT_CLK := ClockDomain.current.readClockWire
|
|
||||||
dataIo.OUTPUT_ENABLE <> data.writeEnable
|
|
||||||
dataIo.D_OUT_0 <> data.write(0)
|
|
||||||
dataIo.D_OUT_1 <> RegNext(data.write(1))
|
|
||||||
|
|
||||||
dataIo.INPUT_CLK := ClockDomain.current.readClockWire
|
|
||||||
data.read(0) := dataIo.D_IN_0
|
|
||||||
data.read(1) := RegNext(dataIo.D_IN_1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
def main(args: Array[String]) {
|
|
||||||
SpinalVerilog(Murax_iCE40_hx8k_breakout_board_xip())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
object MuraxDhrystoneReady{
|
|
||||||
def main(args: Array[String]) {
|
|
||||||
SpinalVerilog(Murax(MuraxConfig.fast.copy(onChipRamSize = 256 kB)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
object MuraxDhrystoneReadyMulDivStatic{
|
|
||||||
def main(args: Array[String]) {
|
|
||||||
SpinalVerilog({
|
|
||||||
val config = MuraxConfig.fast.copy(onChipRamSize = 256 kB)
|
|
||||||
config.cpuPlugins += new MulPlugin
|
|
||||||
config.cpuPlugins += new DivPlugin
|
|
||||||
config.cpuPlugins.remove(config.cpuPlugins.indexWhere(_.isInstanceOf[BranchPlugin]))
|
|
||||||
config.cpuPlugins +=new BranchPlugin(
|
|
||||||
earlyBranch = false,
|
|
||||||
catchAddressMisaligned = false
|
|
||||||
)
|
|
||||||
config.cpuPlugins += new IBusSimplePlugin(
|
|
||||||
resetVector = 0x00000000l,
|
|
||||||
cmdForkOnSecondStage = true,
|
|
||||||
cmdForkPersistence = false,
|
|
||||||
prediction = STATIC,
|
|
||||||
catchAccessFault = false,
|
|
||||||
compressedGen = false
|
|
||||||
)
|
|
||||||
config.cpuPlugins.remove(config.cpuPlugins.indexWhere(_.isInstanceOf[LightShifterPlugin]))
|
|
||||||
config.cpuPlugins += new FullBarrelShifterPlugin
|
|
||||||
Murax(config)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Will blink led and echo UART RX to UART TX (in the verilator sim, type some text and press enter to send UART frame to the Murax RX pin)
|
|
||||||
object MuraxWithRamInit{
|
|
||||||
def main(args: Array[String]) {
|
|
||||||
SpinalVerilog(Murax(MuraxConfig.default.copy(onChipRamSize = 4 kB, onChipRamHexFile = "src/main/ressource/hex/muraxDemo.hex")))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
object Murax_arty{
|
|
||||||
def main(args: Array[String]) {
|
|
||||||
val hex = "src/main/c/murax/hello_world/build/hello_world.hex"
|
|
||||||
SpinalVerilog(Murax(MuraxConfig.default(false).copy(coreFrequency = 100 MHz,onChipRamSize = 32 kB, onChipRamHexFile = hex)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
object MuraxAsicBlackBox extends App{
|
|
||||||
println("Warning this soc do not has any rom to boot on.")
|
|
||||||
val config = SpinalConfig()
|
|
||||||
config.addStandardMemBlackboxing(blackboxAll)
|
|
||||||
config.generateVerilog(Murax(MuraxConfig.default()))
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
.text
|
|
||||||
.global _start
|
|
||||||
.type _start, @function
|
|
||||||
|
|
||||||
_start:
|
|
||||||
# Initialize global pointer
|
|
||||||
.option push
|
|
||||||
.option norelax
|
|
||||||
la gp, __global_pointer$
|
|
||||||
.option pop
|
|
||||||
|
|
||||||
li sp, 0x1fff0
|
|
||||||
|
|
||||||
# Clear the bss segment
|
|
||||||
la a0, __bss_start
|
|
||||||
la a1, __BSS_END__
|
|
||||||
|
|
||||||
clear_bss:
|
|
||||||
bgeu a0, a1, finish_bss
|
|
||||||
sb x0, 0(a0)
|
|
||||||
addi a0, a0, 1
|
|
||||||
beq x0, x0, clear_bss
|
|
||||||
finish_bss:
|
|
||||||
|
|
||||||
nop //!
|
|
||||||
|
|
||||||
call main
|
|
||||||
|
|
||||||
nop //!
|
|
||||||
|
|
||||||
# abort execution here
|
|
||||||
ebreak
|
|
||||||
|
|
||||||
.section .rodata
|
|
||||||
alfabet:
|
|
||||||
.string "abcdefghijklmnopqrstuwxyz"
|
|
||||||
slowo:
|
|
||||||
|
|
||||||
.section .data
|
|
||||||
wynik:
|
|
||||||
.string "mpabi"
|
|
||||||
.space 26 # rezerwuje 26 bajtów dla wyniku, zainicjowane na 0
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
.text
|
|
||||||
.global _start
|
|
||||||
.type _start, @function
|
|
||||||
|
|
||||||
_start:
|
|
||||||
# Initialize global pointer
|
|
||||||
.option push
|
|
||||||
.option norelax
|
|
||||||
la gp, __global_pointer$
|
|
||||||
.option pop
|
|
||||||
|
|
||||||
# Initialize stack pointer from linker script symbol
|
|
||||||
la sp, __stack_top
|
|
||||||
|
|
||||||
# Clear the BSS segment
|
|
||||||
la a0, __bss_start
|
|
||||||
la a1, __bss_end
|
|
||||||
|
|
||||||
clear_bss:
|
|
||||||
bgeu a0, a1, finish_bss
|
|
||||||
sb x0, 0(a0)
|
|
||||||
addi a0, a0, 1
|
|
||||||
j clear_bss
|
|
||||||
finish_bss:
|
|
||||||
|
|
||||||
call main
|
|
||||||
|
|
||||||
ebreak
|
|
||||||
|
|
||||||
.section .rodata
|
|
||||||
|
|
||||||
alfabet:
|
|
||||||
.string "abcdefghijklmnopqrstuwxyz"
|
|
||||||
slowo:
|
|
||||||
|
|
||||||
.section .data
|
|
||||||
wynik:
|
|
||||||
.string "mpabi"
|
|
||||||
.space 26 # rezerwuje 26 bajtów dla wyniku, zainicjowane na 0
|
|
||||||
126
cpp/_rvmain.cpp
126
cpp/_rvmain.cpp
|
|
@ -1,4 +1,5 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include "myfunc.h"
|
||||||
|
|
||||||
int strlen(char *s) {
|
int strlen(char *s) {
|
||||||
char *p = s;
|
char *p = s;
|
||||||
|
|
@ -7,14 +8,28 @@ int strlen(char *s) {
|
||||||
return p - s;
|
return p - s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void strcpy(char *s, char *t)
|
void strcpy(char *s, char *t)
|
||||||
{
|
{
|
||||||
while (*s++ = *t++);
|
while (*s++ = *t++);
|
||||||
}
|
}
|
||||||
#define ALLOCSIZE 10000
|
|
||||||
|
|
||||||
|
|
||||||
|
// Effective C++ by Scott Meyers
|
||||||
|
// page. 6
|
||||||
|
// Item 1: Prefer const and inline to #define.
|
||||||
|
//
|
||||||
|
class NewDefine{
|
||||||
|
|
||||||
|
private:
|
||||||
|
static const int ALLOCSIZE;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
const int NewDefine::ALLOCSIZE = 10000;
|
||||||
|
|
||||||
|
#define ALLOCSIZE 10000
|
||||||
static char allocbuf[ALLOCSIZE];
|
static char allocbuf[ALLOCSIZE];
|
||||||
|
|
||||||
static char *allocp = allocbuf;
|
static char *allocp = allocbuf;
|
||||||
|
|
||||||
char *alloc(int n)
|
char *alloc(int n)
|
||||||
|
|
@ -37,20 +52,11 @@ char *alloc(int n)
|
||||||
//pre processor
|
//pre processor
|
||||||
#define LEN (8+2)*10
|
#define LEN (8+2)*10
|
||||||
|
|
||||||
struct model {
|
|
||||||
char * str;
|
|
||||||
uint32_t len ;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
//alg
|
//alg
|
||||||
// prosta implementacji func. z bibl. std. strok przy uzyciu gpt3.5
|
// prosta implementacji func. z bibl. std. strok przy uzyciu gpt3.5
|
||||||
//
|
//
|
||||||
|
|
||||||
#define NULL ((void*) 0)
|
#define NULL ((void*) 0)
|
||||||
|
|
||||||
//
|
|
||||||
// Funkcja pomocnicza do sprawdzania, czy znak jest wśród delimiterów
|
|
||||||
bool is_delim(char c, const char *delims) {
|
bool is_delim(char c, const char *delims) {
|
||||||
while (*delims) {
|
while (*delims) {
|
||||||
if (c == *delims) {
|
if (c == *delims) {
|
||||||
|
|
@ -61,103 +67,85 @@ bool is_delim(char c, const char *delims) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Najprostsza implementacja funkcji strtok
|
|
||||||
char *simple_strtok(char *str, const char *delims) {
|
char *simple_strtok(char *str, const char *delims) {
|
||||||
static char *static_str = (char *) NULL; // Przechowuje wskaźnik do bieżącej pozycji w ciągu
|
char *static_str = (char *) NULL;
|
||||||
|
|
||||||
// Jeśli przekazano nowy ciąg, zaktualizuj static_str
|
if (str !=(char *) NULL) {
|
||||||
if (str == NULL) {
|
|
||||||
return (char *) NULL; // str nie wskazuje na zdanie !!!
|
|
||||||
}
|
|
||||||
static_str = str;
|
static_str = str;
|
||||||
|
}
|
||||||
|
|
||||||
// " .,mpabi"
|
if (static_str == (char *) NULL) {
|
||||||
// ^
|
return (char *)NULL;
|
||||||
|
}
|
||||||
|
|
||||||
// Pomiń początkowe delimitery
|
|
||||||
while (*static_str && is_delim(*static_str, delims)) {
|
while (*static_str && is_delim(*static_str, delims)) {
|
||||||
static_str++;
|
static_str++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Jeśli doszliśmy do końca ciągu, zwróć NULL
|
|
||||||
if (*static_str == '\0') {
|
if (*static_str == '\0') {
|
||||||
return (char *) NULL;
|
return (char *)NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Zapisz początek tokenu
|
|
||||||
char *token_start = static_str;
|
char *token_start = static_str;
|
||||||
|
|
||||||
// Znajdź koniec tokenu
|
|
||||||
while (*static_str && !is_delim(*static_str, delims)) {
|
while (*static_str && !is_delim(*static_str, delims)) {
|
||||||
static_str++;
|
static_str++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Jeśli znaleziono delimitery, zamień je na '\0' i zaktualizuj static_str
|
|
||||||
if (*static_str) {
|
if (*static_str) {
|
||||||
*static_str = '\0';
|
*static_str = '\0';
|
||||||
static_str++;
|
static_str++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Zwróć początek tokenu
|
|
||||||
return token_start;
|
return token_start;
|
||||||
}
|
}
|
||||||
|
|
||||||
char buf[100];
|
char buf[1000];
|
||||||
struct model * p = (struct model *) buf; //p[1]
|
struct model * p = (struct model *) buf; //p[1]
|
||||||
////func alg
|
|
||||||
//in: ptr to date
|
|
||||||
//return: count of words
|
|
||||||
int alg (const char * ptr) {
|
|
||||||
|
|
||||||
char bufer[ALLOCSIZE];
|
|
||||||
strcpy(bufer, (char *)ptr);
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
int alg(char *ptr) {
|
||||||
const char *delims = " ,.!?:;\n\t";
|
const char *delims = " ,.!?:;\n\t";
|
||||||
|
int pos = 0;
|
||||||
|
|
||||||
int8_t count = 0;
|
char *token = simple_strtok(ptr, delims);
|
||||||
|
|
||||||
char *token = simple_strtok(bufer, delims);
|
|
||||||
|
|
||||||
while (token != (char *)NULL) {
|
while (token != (char *)NULL) {
|
||||||
|
p[pos].ptr = token;
|
||||||
p[count].str = token;
|
p[pos].len = strlen(token);
|
||||||
p[count].len = strlen(token);
|
++pos;
|
||||||
|
|
||||||
token = simple_strtok((char *)NULL, delims);
|
token = simple_strtok((char *)NULL, delims);
|
||||||
count++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return count;
|
return pos;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
int alg(char *ptr) {
|
||||||
|
const char *delims = " ,.!?:;\n\t";
|
||||||
|
int pos = 0;
|
||||||
|
|
||||||
|
char *token = simple_strtok(ptr, delims);
|
||||||
|
while (token != (char *)NULL) {
|
||||||
|
p[pos].ptr = token;
|
||||||
|
p[pos].len = strlen(token);
|
||||||
|
++pos;
|
||||||
|
token = simple_strtok((char *)NULL, delims);
|
||||||
|
}
|
||||||
|
return pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// gdb: p/x (model[]*)p[0].len
|
||||||
|
// gdb: p/s (char *)(model[]*)p[2].ptr
|
||||||
|
// gdb: p *p@5
|
||||||
|
// :) powered by rv32i
|
||||||
int main() {
|
int main() {
|
||||||
|
char *str = " Success is often defined as the ability to reach your goals in life, whatever those goals may be. In some ways, a better word for success might be attainment, accomplishment, or progress. It is not necessarily a destination but a journey that helps develop the skills and resources you need to thrive.";
|
||||||
char *str = "If wantered relation no surprise of all";
|
|
||||||
|
|
||||||
alg(str);
|
alg(str);
|
||||||
|
|
||||||
asm ("nop");
|
asm ("nop");
|
||||||
|
|
||||||
|
bubbleSort(p,10);
|
||||||
|
|
||||||
|
asm ("nop");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// wynik tego kodu:
|
|
||||||
// p[0].str = If
|
|
||||||
// p[0].len = 2
|
|
||||||
|
|
||||||
// p[1].str = wantered
|
|
||||||
// p[1].len = 8
|
|
||||||
|
|
||||||
// p[2].str = relation
|
|
||||||
// p[2].len = 8
|
|
||||||
|
|
||||||
// p[3].str = no
|
|
||||||
// p[3].len = 2
|
|
||||||
|
|
||||||
// p[4].str = surprise
|
|
||||||
// p[4].len = 8
|
|
||||||
|
|
||||||
// p[5].str = of
|
|
||||||
// p[5].len = 2
|
|
||||||
|
|
||||||
// p[6].str = all
|
|
||||||
// p[6].len = 3
|
|
||||||
|
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
MEMORY
|
|
||||||
{
|
|
||||||
RAM (wx) : ORIGIN = 0x0, LENGTH = 128K
|
|
||||||
}
|
|
||||||
|
|
||||||
SECTIONS
|
|
||||||
{
|
|
||||||
.text :
|
|
||||||
{
|
|
||||||
*(.text*)
|
|
||||||
*(.rodata*)
|
|
||||||
} > RAM
|
|
||||||
|
|
||||||
.data :
|
|
||||||
{
|
|
||||||
*(.data*)
|
|
||||||
} > RAM
|
|
||||||
|
|
||||||
.bss :
|
|
||||||
{
|
|
||||||
*(.bss*)
|
|
||||||
*(COMMON)
|
|
||||||
} > RAM
|
|
||||||
|
|
||||||
/* Add stack at the end of RAM */
|
|
||||||
. = ALIGN(4);
|
|
||||||
_end = .;
|
|
||||||
PROVIDE(end = .);
|
|
||||||
|
|
||||||
/* Define stack size and location */
|
|
||||||
_stack_size = 0x4000; /* Example stack size: 16KB */
|
|
||||||
_stack_end = ORIGIN(RAM) + LENGTH(RAM); /* End of RAM */
|
|
||||||
_stack_start = _stack_end - _stack_size; /* Calculate start of the stack */
|
|
||||||
.stack (NOLOAD) :
|
|
||||||
{
|
|
||||||
. = ALIGN(4);
|
|
||||||
. = . + _stack_size;
|
|
||||||
. = ALIGN(4);
|
|
||||||
_sp = .;
|
|
||||||
} > RAM
|
|
||||||
|
|
||||||
PROVIDE(__stack = _sp);
|
|
||||||
}
|
|
||||||
|
|
@ -1,67 +0,0 @@
|
||||||
/* Linker script for a system with 128KB RAM starting at 0x10000 */
|
|
||||||
MEMORY
|
|
||||||
{
|
|
||||||
RAM (wx) : ORIGIN = 0x0000, LENGTH = 128K
|
|
||||||
}
|
|
||||||
|
|
||||||
SECTIONS
|
|
||||||
{
|
|
||||||
/* Place code and readonly data at the beginning of RAM */
|
|
||||||
.text :
|
|
||||||
{
|
|
||||||
*(.text*)
|
|
||||||
*(.rodata*)
|
|
||||||
} > RAM
|
|
||||||
|
|
||||||
/* Place initialized data right after the .text section */
|
|
||||||
.data :
|
|
||||||
{
|
|
||||||
. = ALIGN(4);
|
|
||||||
*(.data*)
|
|
||||||
} > RAM
|
|
||||||
|
|
||||||
/* Uninitialized data (BSS) follows initialized data */
|
|
||||||
.bss :
|
|
||||||
{
|
|
||||||
. = ALIGN(4);
|
|
||||||
__bss_start = .;
|
|
||||||
*(.bss*)
|
|
||||||
*(COMMON)
|
|
||||||
. = ALIGN(4);
|
|
||||||
__bss_end = .;
|
|
||||||
} > RAM
|
|
||||||
|
|
||||||
/* Define heap start right after bss */
|
|
||||||
. = ALIGN(4);
|
|
||||||
__heap_start = .;
|
|
||||||
PROVIDE(heap_start = __heap_start);
|
|
||||||
|
|
||||||
/* Leave space for the heap by not explicitly defining its end */
|
|
||||||
/* The heap grows towards the stack */
|
|
||||||
|
|
||||||
/* Reserve space for the stack at the end of RAM */
|
|
||||||
/* Let's say we want a 16KB stack */
|
|
||||||
. = ALIGN(4);
|
|
||||||
__stack_size = 16K; /* Size of the stack */
|
|
||||||
__stack_top = ORIGIN(RAM) + LENGTH(RAM); /* Top of the stack */
|
|
||||||
__stack_start = __stack_top - __stack_size; /* Start of the stack */
|
|
||||||
.stack (NOLOAD) :
|
|
||||||
{
|
|
||||||
. = __stack_start;
|
|
||||||
. += __stack_size; /* Allocate space for the stack */
|
|
||||||
. = ALIGN(4);
|
|
||||||
} > RAM
|
|
||||||
|
|
||||||
PROVIDE(__stack = __stack_top);
|
|
||||||
PROVIDE(stack_top = __stack_top);
|
|
||||||
PROVIDE(stack_start = __stack_start);
|
|
||||||
|
|
||||||
/* Heap end is dynamically located at the start of the stack */
|
|
||||||
__heap_end = __stack_start;
|
|
||||||
PROVIDE(heap_end = __heap_end);
|
|
||||||
|
|
||||||
/* End of RAM usage */
|
|
||||||
. = ALIGN(4);
|
|
||||||
_end = .;
|
|
||||||
PROVIDE(end = _end);
|
|
||||||
}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
MEMORY
|
|
||||||
{
|
|
||||||
RAM (wx) : ORIGIN = 0x10000, LENGTH = 128K
|
|
||||||
}
|
|
||||||
|
|
||||||
SECTIONS
|
|
||||||
{
|
|
||||||
.text : { *(.text*) } > RAM
|
|
||||||
.rodata : { *(.rodata*) } > RAM
|
|
||||||
.data : { *(.data*) } > RAM
|
|
||||||
.bss : { *(.bss*) } > RAM
|
|
||||||
_end = .; /* Definiuje koniec sekcji danych, może być używane do określenia rozmiaru sterty */
|
|
||||||
}
|
|
||||||
|
|
@ -1,35 +1,44 @@
|
||||||
#include "myfunc.h"
|
#include "myfunc.h"
|
||||||
|
|
||||||
// Lokalna deklaracja funkcji my_strlen
|
int strncmp(const char* s1, const char* s2, int n) {
|
||||||
static int my_strlen(const char *str) {
|
for (int i = 0; i < n; i++) {
|
||||||
int length = 0;
|
if (s1[i] != s2[i]) {
|
||||||
while (str[length] != '\0') {
|
return (unsigned char)s1[i] - (unsigned char)s2[i];
|
||||||
length++;
|
|
||||||
}
|
}
|
||||||
return length;
|
if (s1[i] == '\0' || s2[i] == '\0') {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void count_characters(const char* alfabet, const char* slowo, uint8_t* wynik) {
|
bool compareWords(const char* a, int lenA, const char* b, int lenB) {
|
||||||
// Użycie my_strlen do obliczenia długości alfabetu
|
int minLen = (lenA < lenB) ? lenA : lenB;
|
||||||
int alfabet_length = my_strlen(alfabet);
|
int cmp = strncmp(a, b, minLen);
|
||||||
|
if (cmp == 0) {
|
||||||
|
return lenA < lenB;
|
||||||
|
}
|
||||||
|
return cmp < 0;
|
||||||
|
}
|
||||||
|
|
||||||
for (int i = 0; i < alfabet_length; ++i) {
|
void bubbleSort(model arr[], int n) {
|
||||||
wynik[i] = 0;
|
bool swapped;
|
||||||
|
for (int i = 0; i < n-1; i++) {
|
||||||
|
swapped = false;
|
||||||
|
|
||||||
|
for (int j = 0; j < n-i-1; j++) {
|
||||||
|
if (!compareWords(arr[j].ptr, arr[j].len, arr[j+1].ptr, arr[j+1].len)) {
|
||||||
|
|
||||||
|
// Zamiana miejscami
|
||||||
|
model temp = arr[j];
|
||||||
|
arr[j] = arr[j+1];
|
||||||
|
arr[j+1] = temp;
|
||||||
|
swapped = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = 0; i < alfabet_length; ++i) {
|
if (!swapped) {
|
||||||
for (int j = 0; slowo[j] != '\0'; ++j) {
|
break;
|
||||||
if (alfabet[i] == slowo[j]) {
|
|
||||||
wynik[i]++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// #include "myfunc.h"
|
|
||||||
|
|
||||||
// const char* alfabet = "abcdefghijklmnopqrstuwxyz";
|
|
||||||
// const char* slowo = "mpabi";
|
|
||||||
// int wynik[26] = {0}; // Inicjalizacja tablicy wyników na 0
|
|
||||||
|
|
||||||
// count_characters(alfabet, slowo, wynik);
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,11 @@
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
struct model {
|
||||||
|
char * ptr;
|
||||||
|
uint32_t len ;
|
||||||
|
};
|
||||||
|
|
||||||
void count_characters(const char* alfabet, const char* slowo, uint8_t* wynik);
|
void bubbleSort(model arr[], int n);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
111
igit-borys.py
111
igit-borys.py
|
|
@ -1,111 +0,0 @@
|
||||||
import argparse
|
|
||||||
import json
|
|
||||||
import sys
|
|
||||||
import subprocess
|
|
||||||
import os
|
|
||||||
from datetime import datetime
|
|
||||||
|
|
||||||
DEFAULT_CONFIG = {
|
|
||||||
"user": "borysr",
|
|
||||||
"email": "borysr@gmail.com",
|
|
||||||
"remotes": [{
|
|
||||||
"name": "r", # Zaktualizowano z "default" na "mpabi"
|
|
||||||
"protocol": "http",
|
|
||||||
"domain": "qstack.pl",
|
|
||||||
"port": "3000",
|
|
||||||
"token_name": "t",
|
|
||||||
"token": "8ee3f1b7980197aeceadee3cf4d980f817d44f06",
|
|
||||||
"group": "1i-2023",
|
|
||||||
"project": "homework"
|
|
||||||
}]
|
|
||||||
}
|
|
||||||
|
|
||||||
def load_or_create_config(config_file, args):
|
|
||||||
config_exists = os.path.exists(config_file) and os.stat(config_file).st_size != 0
|
|
||||||
if config_exists:
|
|
||||||
with open(config_file, 'r') as file:
|
|
||||||
config = json.load(file)
|
|
||||||
else:
|
|
||||||
config = DEFAULT_CONFIG.copy()
|
|
||||||
|
|
||||||
# Znajdź istniejące zdalne repozytorium o podanej nazwie
|
|
||||||
remote = next((remote for remote in config['remotes'] if remote['name'] == args.remote), None)
|
|
||||||
|
|
||||||
# Jeśli istnieje zdalne repozytorium i podano argumenty związane z konfiguracją zdalnego repozytorium
|
|
||||||
if remote:
|
|
||||||
for field in ['protocol', 'domain', 'port', 'token_name', 'token', 'group', 'project']:
|
|
||||||
# Aktualizuj tylko, jeśli argument został jawnie podany
|
|
||||||
if getattr(args, field, None) is not None:
|
|
||||||
remote[field] = getattr(args, field)
|
|
||||||
|
|
||||||
# Jeśli zdalne repozytorium nie istnieje, ale podano nazwę, tworzymy nowe zdalne repozytorium
|
|
||||||
elif args.remote:
|
|
||||||
new_remote = {'name': args.remote}
|
|
||||||
for field in ['protocol', 'domain', 'port', 'token_name', 'token', 'group', 'project']:
|
|
||||||
new_remote[field] = getattr(args, field, DEFAULT_CONFIG['remotes'][0].get(field, ''))
|
|
||||||
if new_remote[field] == None:
|
|
||||||
new_remote[field] = DEFAULT_CONFIG['remotes'][0].get(field, '')
|
|
||||||
config['remotes'].append(new_remote)
|
|
||||||
|
|
||||||
# Aktualizuj informacje o użytkowniku i email, tylko jeśli zostały podane
|
|
||||||
if getattr(args, 'user', None):
|
|
||||||
config['user'] = args.user
|
|
||||||
if getattr(args, 'email_domain', None):
|
|
||||||
config['email'] = f"{args.user}@{args.email_domain}"
|
|
||||||
|
|
||||||
# Zapisz zmodyfikowaną konfigurację
|
|
||||||
with open(config_file, 'w') as file:
|
|
||||||
json.dump(config, file, indent=4)
|
|
||||||
|
|
||||||
return config
|
|
||||||
|
|
||||||
|
|
||||||
def init_git_repo(config):
|
|
||||||
user_name = config['user']
|
|
||||||
user_email = config['email']
|
|
||||||
branch_name = f"{user_name}-{datetime.now().strftime('%Y-%m-%d')}"
|
|
||||||
|
|
||||||
if subprocess.run(["git", "rev-parse", "--git-dir"], stderr=subprocess.DEVNULL).returncode != 0:
|
|
||||||
subprocess.run(["git", "init"])
|
|
||||||
subprocess.run(["git", "config", "user.name", user_name])
|
|
||||||
subprocess.run(["git", "config", "user.email", user_email])
|
|
||||||
subprocess.run(["git", "checkout", "-b", branch_name])
|
|
||||||
print("Git repository initialized.")
|
|
||||||
else:
|
|
||||||
print("Already inside a Git repository. Skipping initialization.")
|
|
||||||
|
|
||||||
remotesFromList = str(subprocess.run(["git", "remote", "-v"], capture_output=True).stdout)
|
|
||||||
remotesFromList = remotesFromList.replace('b\'', "").replace('\'', "").split('\\n')
|
|
||||||
for rm in remotesFromList:
|
|
||||||
name = rm.split("\\t")[0]
|
|
||||||
subprocess.run(["git", "remote", "remove", name], stderr=subprocess.DEVNULL)
|
|
||||||
|
|
||||||
for remote in config['remotes']:
|
|
||||||
remote_url = f"{remote['protocol']}://{remote['token_name']}:{remote['token']}@{remote['domain']}:{remote['port']}/{remote['group']}/{remote['project']}"
|
|
||||||
# Usunięcie i ponowne dodanie zdalnego repozytorium, jeśli jest zaktualizowane
|
|
||||||
#subprocess.run(["git", "remote", "remove", remote['name']], stderr=subprocess.DEVNULL)
|
|
||||||
subprocess.run(["git", "remote", "add", remote['name'], remote_url])
|
|
||||||
print(f"Remote '{remote['name']}' added or updated.")
|
|
||||||
|
|
||||||
def main():
|
|
||||||
parser = argparse.ArgumentParser(description="Git repository initializer with custom configuration.")
|
|
||||||
parser.add_argument("--user", help="User name")
|
|
||||||
parser.add_argument("--email_domain", help="Email domain")
|
|
||||||
parser.add_argument("--config", help="Path to the JSON config file", default="conf.json")
|
|
||||||
parser.add_argument("--remote", help="Name of the remote to add or update")
|
|
||||||
parser.add_argument("--protocol", help="Remote protocol")
|
|
||||||
parser.add_argument("--domain", help="Remote domain")
|
|
||||||
parser.add_argument("--port", help="Remote port")
|
|
||||||
parser.add_argument("--token_name", help="Remote token name")
|
|
||||||
parser.add_argument("--token", help="Remote token")
|
|
||||||
parser.add_argument("--group", help="Group name")
|
|
||||||
parser.add_argument("--project", help="Project name")
|
|
||||||
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
config = load_or_create_config(args.config, args)
|
|
||||||
init_git_repo(config)
|
|
||||||
print("Git repository initialized and configured based on the provided configuration.")
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
Loading…
Reference in New Issue