Skip to content

Commit

Permalink
Problem set 5 for 2019.
Browse files Browse the repository at this point in the history
  • Loading branch information
kohler committed Nov 8, 2019
1 parent 428dcd7 commit 8ccf98e
Show file tree
Hide file tree
Showing 9 changed files with 1,407 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pset5/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*.o
.deps
cmdline
out
sh61
17 changes: 17 additions & 0 deletions pset5/AUTHORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Author and collaborators
========================

Primary student
---------------
(Your name.)


Collaborators
-------------
(List any other collaborators and describe help you got from other students
in the class.)


Citations
---------
(List any other sources consulted.)
33 changes: 33 additions & 0 deletions pset5/GNUmakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Default optimization level
O ?= 2

all: sh61

-include build/rules.mk

%.o: %.cc sh61.hh $(BUILDSTAMP)
$(call run,$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) $(O) -o $@ -c,COMPILE,$<)

sh61: sh61.o helpers.o
$(call run,$(CXX) $(CXXFLAGS) $(O) -o $@ $^ $(LDFLAGS) $(LIBS),LINK $@)

sleep61: sleep61.cc
$(call run,$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) $(O) -o $@ $^ $(LDFLAGS) $(LIBS),BUILD $@)

ifneq ($(filter -fsanitize=leak,$(CXXFLAGS)),)
LEAKCHECK = --leak
endif

check: sh61
perl check.pl $(LEAKCHECK)

check-%: sh61
perl check.pl $(LEAKCHECK) $(subst check-,,$@)

clean: clean-main
clean-main:
$(call run,rm -f sh61 *.o *~ *.bak core *.core,CLEAN)
$(call run,rm -rf out *.dSYM $(DEPSDIR))

.PRECIOUS: %.o
.PHONY: all clean clean-main distclean check check-%
14 changes: 14 additions & 0 deletions pset5/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
CS 61 Problem Set 5
===================

**Fill out both this file and `AUTHORS.md` before submitting.** We grade
anonymously, so put all personally identifying information, including
collaborators, in `AUTHORS.md`.

Grading notes (if any)
----------------------



Extra credit attempted (if any)
-------------------------------
104 changes: 104 additions & 0 deletions pset5/build/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
# are we using clang?
ISCLANG := $(shell if $(CC) --version | grep -e 'LLVM\|clang' >/dev/null; then echo 1; fi)
ISLINUX := $(if $(wildcard /usr/include/linux/*.h),1,)

CFLAGS := -std=gnu11 -W -Wall -Wshadow -g $(DEFS) $(CFLAGS)
CXXFLAGS := -std=gnu++1z -W -Wall -Wshadow -g $(DEFS) $(CXXFLAGS)
O ?= -O3
ifeq ($(filter 0 1 2 3 s,$(O)$(NOOVERRIDEO)),$(strip $(O)))
override O := -O$(O)
endif

# sanitizer arguments
ifndef SAN
SAN := $(or $(SANITIZE),$(ASAN),$(LSAN),$(LEAKSAN),$(TSAN),$(UBSAN))
endif
ifndef TSAN
ifeq ($(WANT_TSAN),1)
TSAN := $(SAN)
endif
endif

check_for_sanitizer = $(if $(strip $(shell $(CC) -fsanitize=$(1) -x c -E /dev/null 2>&1 | grep sanitize=)),$(info ** WARNING: The `$(CC)` compiler does not support `-fsanitize=$(1)`.),1)
ifeq ($(TSAN),1)
ifeq ($(or $(ISCLANG),$(filter-out 3.% 4.% 5.% 6.%,$(shell $(CC) -dumpversion)),$(filter-out Linux%,$(shell uname))),)
$(info ** WARNING: If ThreadSanitizer fails, try `make SAN=1 CC=clang`.)
endif
ifeq ($(call check_for_sanitizer,thread),1)
CFLAGS += -fsanitize=thread
CXXFLAGS += -fsanitize=thread
endif
else
ifeq ($(or $(ASAN),$(SAN)),1)
ifeq ($(call check_for_sanitizer,address),1)
CFLAGS += -fsanitize=address
CXXFLAGS += -fsanitize=address
endif
endif
ifeq ($(or $(LSAN),$(LEAKSAN)),1)
ifeq ($(call check_for_sanitizer,leak),1)
CFLAGS += -fsanitize=leak
CXXFLAGS += -fsanitize=leak
endif
endif
endif
ifeq ($(or $(UBSAN),$(SAN)),1)
ifeq ($(call check_for_sanitizer,undefined),1)
CFLAGS += -fsanitize=undefined
CXXFLAGS += -fsanitize=undefined
endif
endif

# profiling
ifeq ($(or $(PROFILE),$(PG)),1)
CFLAGS += -pg
CXXFLAGS += -pg
endif

# these rules ensure dependencies are created
DEPCFLAGS = -MD -MF $(DEPSDIR)/$*.d -MP
DEPSDIR := .deps
BUILDSTAMP := $(DEPSDIR)/rebuildstamp
DEPFILES := $(wildcard $(DEPSDIR)/*.d)
ifneq ($(DEPFILES),)
include $(DEPFILES)
endif

# when the C compiler or optimization flags change, rebuild all objects
ifneq ($(strip $(DEP_CC)),$(strip $(CC) $(CPPFLAGS) $(CFLAGS) $(O)))
DEP_CC := $(shell mkdir -p $(DEPSDIR); echo >$(BUILDSTAMP); echo "DEP_CC:=$(CC) $(CPPFLAGS) $(CFLAGS) $(O)" >$(DEPSDIR)/_cc.d)
endif
ifneq ($(strip $(DEP_CXX)),$(strip $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(O)))
DEP_CXX := $(shell mkdir -p $(DEPSDIR); echo >$(BUILDSTAMP); echo "DEP_CXX:=$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(O)" >$(DEPSDIR)/_cxx.d)
endif


V = 0
ifeq ($(V),1)
run = $(1) $(3)
xrun = /bin/echo "$(1) $(3)" && $(1) $(3)
else
run = @$(if $(2),/bin/echo " $(2) $(3)" &&,) $(1) $(3)
xrun = $(if $(2),/bin/echo " $(2) $(3)" &&,) $(1) $(3)
endif
runquiet = @$(1) $(3)

# cancel implicit rules we don't want
%: %.c
%.o: %.c
%: %.cc
%.o: %.cc
%: %.o

$(BUILDSTAMP):
@mkdir -p $(@D)
@echo >$@

always:
@:

clean-hook:
@:

.PHONY: always clean-hook
.PRECIOUS: %.o
Loading

0 comments on commit 8ccf98e

Please sign in to comment.