Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3bd7f117375b
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 85c5b157a0b8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 27, 2015

  1. Copy the full SHA
    8b5b219 View commit details
  2. Copy the full SHA
    85c5b15 View commit details
Showing with 5 additions and 4 deletions.
  1. +2 −2 artiq/test/full_stack.py
  2. +3 −2 soc/runtime/services.c
4 changes: 2 additions & 2 deletions artiq/test/full_stack.py
Original file line number Diff line number Diff line change
@@ -82,9 +82,9 @@ def off(self, t):

@kernel
def pulse(self, f, duration):
self.on(int(now()*1000000000), f)
self.on(round(now()*1000000000), f)
delay(duration)
self.off(int(now()*1000000000))
self.off(round(now()*1000000000))


class _Pulses(AutoDB):
5 changes: 3 additions & 2 deletions soc/runtime/services.c
Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@ extern __divsi3, __modsi3, __ledf2, __gedf2, __unorddf2, __eqdf2, __ltdf2,
__divsf3, __lshrdi3, __muldi3, __divdi3, __ashldi3, __ashrdi3,
__udivmoddi4, __floatsisf, __floatunsisf, __fixsfsi, __fixunssfsi,
__adddf3, __subdf3, __muldf3, __divdf3, __floatsidf, __floatunsidf,
__floatdidf, __fixdfsi, __fixunsdfsi, __clzsi2, __ctzsi2, __udivdi3,
__umoddi3, __moddi3;
__floatdidf, __fixdfsi, __fixdfdi, __fixunsdfsi, __clzsi2, __ctzsi2,
__udivdi3, __umoddi3, __moddi3;
#pragma GCC diagnostic pop

static const struct symbol compiler_rt[] = {
@@ -55,6 +55,7 @@ static const struct symbol compiler_rt[] = {
{"floatunsidf", &__floatunsidf},
{"floatdidf", &__floatdidf},
{"fixdfsi", &__fixdfsi},
{"fixdfdi", &__fixdfdi},
{"fixunsdfsi", &__fixunsdfsi},
{"clzsi2", &__clzsi2},
{"ctzsi2", &__ctzsi2},